Merge branch 'develop' into ticket-57_develop

Eddy Young

2015-05-22 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66

 .gitignore

@@ -28,3 +28,4 @@
/**/.idea
/**/init.lua
/**/session
/nbproject/private