Merge branch 'master' into dev/reqif

# Conflicts:
#	.gitignore

diff --cc .gitignore
index 9dce1e33f3a28352293d908304e64f272b3b7404,b4f904e58f79527754e898d380a5c57671a9e50a..0493c6aa12ca0ca69f62d4eeb775377c2630be81
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,6 @@@
  
 +Build
 +*~
+ *.*~
+ *.bak
+ *.swp