Merge branch 'master' into dan_latest

diff --cc .gitignore
index 5b956fd,16b0dfb..5f5dc3a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -43,6 -45,9 +45,11 @@@ scripts/mock-
  ehthumbs.db
  Thumbs.db
  
 -# slickedit files #
 -###################
++
 +# IDE/ Editors files #
 +######################
 +.idea/
+ *.vpj
+ *.vpw
+ *.vtg
+ *.vpwhist