Merge branch 'topic/pr-934' into develop

James Moger

2015-10-05 4e54686d9346dc33a1cffd4a06c5c4ff9945f25e

 .gitignore

@@ -1,15 +1,32 @@
tags
/temp
/lib
/ext
/build
/keystore
/*.zip
/gitblit.properties
/users.properties
/site
/git
/target
/lucene
/build.properties
/war
/*.war
/proposals
/federation.properties
/mailtest.properties
/test-users.conf
/.settings/
/src/main/java/reference.properties
/src/main/java/WEB-INF/reference.properties
/bin/
/build-demo.xml
*.directory
/.gradle
/pom.xml
/x509test
/data
/*.conf
/build-next.xml
/*.ps1
/*.sh
/*.factorypath
/src/main/dagger
/**/.idea
/**/init.lua
/**/session
/nbproject/private