add pages controller and admin page view
Merge branch 'feature/design_fix_4' into staging

Conflicts:
	app/views/web/welcome/index.html.haml