introduce static pages
Merge branch 'master' of origin, because of non-fast-forward

Conflicts:
	app/controllers/pages_controller.rb