flake8
Merge branch 'master' into next

* master:
  flake8

Conflicts:
	feincms/content/application/models.py
	tests/testapp/tests/test_page.py
tox: Remove an unnecessary script since switching to zipballs for Django

Also see changes to tox.ini in d96a4b4274e82279c2b31032d9c26bd2cbbbffe7.
Fix #510: Document settings
Fix #532: Make the template fallback Python3-compatible

Thanks to Nils Fredrik Gjerull for the report.
FeinCMS v1.9.4
Merge branch 'master' into next

* master:
  FeinCMS v1.9.4
  Fix #532: Make the template fallback Python3-compatible

Conflicts:
	feincms/__init__.py
Merge remote-tracking branch 'mk/master'

* mk/master:
  flake8
Merge branch 'master' into next

* master:
  flake8

Conflicts:
	feincms/content/application/models.py
	tests/testapp/tests/test_page.py
Merge remote-tracking branch 'official/next' into next

* official/next:
  Fix #510: Document settings
  tox: Remove an unnecessary script since switching to zipballs for Django

Conflicts:
	tests/testapp/tests/test_page.py