menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/js/controllers.js
	app/partials/partial1.html
menu