no message
Merge remote-tracking branch 'origin/master'

Conflicts:
	grupp_arbete/admin/css/support.css
	grupp_arbete/admin/support.php