Merge branch 'dev' into base-layout

Conflicts:
	app/styles/commons.less
	app/styles/home.less
	bower.json
	gulpfile.js