update .gitignore add public/assets to gitignore
Merge branch 'master' into develop/2.0