fix main layout and some angular files
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/scripts/app.js
	app/views/main.html