update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/css/style.css
	app/css/style.less
	app/partials/public-not-logged.html