Normalize css and templates renamed
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/partials/panel_4.html