Fixing a bunch of errors
Merge branch 'master' of github.com:steria/teamsteria

Conflicts:
	index.html
	js/app.js
	partials/home.html
deleting menuCtr.ja