updated error page
- tweaks
Merge branch 'master' of https://github.com/element4git/pluggedin

Conflicts:
	css/global.css
	css/global.scss
Merge branch 'master' into pluggedin_live