Merge branch 'topic/pr-934' into develop

James Moger

2015-10-05 4e54686d9346dc33a1cffd4a06c5c4ff9945f25e

 .gitignore

@@ -5,6 +5,7 @@
/build
/site
/git
/lucene
/build.properties
/federation.properties
/mailtest.properties