Merge branch 'develop' into ticket-57_develop

Eddy Young

2015-05-22 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66

 .gitignore

@@ -1,3 +1,4 @@
tags
/temp
/lib
/ext
@@ -24,3 +25,7 @@
/*.sh
/*.factorypath
/src/main/dagger
/**/.idea
/**/init.lua
/**/session
/nbproject/private