Merge branch 'static-pages'

Conflicts:
	first_app.iml