First commit with static branch
Finish static pages with Application layout
Merge branch 'static-pages'

Conflicts:
	config/initializers/secret_token.rb