Remove request type controller method namespaces
Add default layout, with partials for the ehader and footer etc
Fix merge conflict, adjust page controller method names
Fix merge and add admin/account controllers