Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/main.js
	app/views/main.html
merge file git ignore