Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 .gitignore

@@ -1,9 +1,11 @@
tags
/temp
/lib
/ext
/build
/site
/git
/lucene
/build.properties
/federation.properties
/mailtest.properties
@@ -27,3 +29,4 @@
/**/.idea
/**/init.lua
/**/session
/nbproject/private