Merge branch 'ticket/91' into develop

James Moger

2014-05-29 38ba369972fe7e01a8ef6a950fd9bd403ef97eb6

 .gitignore

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