Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/main.js