Add a static pages controller
Finish static pages
Finish static pages
Finish static pages
Merge branch 'static_pages'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/runConfigurations/Development__sample_app.xml
	.idea/workspace.xml