Merge remote-tracking branch 'remotes/origin/master'

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

Conflicts:
	app.js