added
Merge branch 'develop'
gitignore clean up. Now use assets prefix for folder to ignore in git and back up using bitsynch