Merge remote-tracking branch 'origin/master'

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