build tag
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/styles/app.less
	bower.json