Merge branch 'topic/pr-934' into develop

James Moger

2015-10-05 4e54686d9346dc33a1cffd4a06c5c4ff9945f25e

 .gitignore

@@ -1,9 +1,11 @@
tags
/temp
/lib
/ext
/build
/site
/git
/lucene
/build.properties
/federation.properties
/mailtest.properties
@@ -22,3 +24,9 @@
/build-next.xml
/*.ps1
/*.sh
/*.factorypath
/src/main/dagger
/**/.idea
/**/init.lua
/**/session
/nbproject/private