Revert e1f5e18..601d8d7

This rolls back to commit e1f5e18a59a1ccade5dfff68c46f172c1079c326.
Revert "Merge branch 'dashboard' into Steph"

Conflicts:
	admin/css/admin.css
	admin/css/style.css
	css/normalize.css
	css/style.css
	head.php
Revert e1f5e18..fca51b8

This rolls back to commit e1f5e18a59a1ccade5dfff68c46f172c1079c326.
Merge branch 'master' into Steph

Conflicts:
	admin.css
	admin/css/admin.css
	admin/css/style.css
	head.php
deleted
Merge branch 'Steph'