adding everythin+front stuff
Merge branch 'front' into develop

Conflicts:
	app/index.html
	app/js/router.js