- lots of layout changes
- turning error PHP back on
Merge branch 'master' of https://github.com/element4git/pluggedin

Conflicts:
	index.php