main_html
Merge remote-tracking branch 'origin/master' into verst

Conflicts:
	app/views/Application/index.html