Fixed missing background of error message
Merge branch 'master' into uploader

Conflicts:
	assets/min/main.css
Merge fix