Merge remote-tracking branch 'origin/master'

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

Conflicts:
	app/view/HomeView.js