Merge branch 'pr-201' into develop

James Moger

2014-06-17 2bbba7b54aa3f9a90b7e399472a9213062ce85aa

 .gitignore

@@ -19,3 +19,11 @@
/x509test
/data
/*.conf
/build-next.xml
/*.ps1
/*.sh
/*.factorypath
/src/main/dagger
/**/.idea
/**/init.lua
/**/session