Added the following to gitignore

*/public/app/js
*/public/app/css
*/public/app/templates
Merge branch 'develop' into feat/marionette-router

Conflicts:
	.gitignore