add a static pages controller
finish static page
final static page
Merge branch 'static-pages'

Conflicts:
	.idea/runConfigurations/Development__sample_app.xml
	.idea/workspace.xml
Finish layout and routes