flake8
Merge branch 'master' into next

* master:
  flake8

Conflicts:
	feincms/content/application/models.py
	tests/testapp/tests/test_page.py