always test with the latest patch release
Update docs to mention modeladmins
Merge pull request #523 from sunliwen/master

Update docs to mention modeladmins
Fix all flake8 2.1.0 warnings
Fix all flake8 2.1.0 warnings

Conflicts:
	feincms/__init__.py
Merge branch 'master' into next

* master:
  Fix all flake8 2.1.0 warnings
Merge remote-tracking branch 'official/master'

* official/master:
  Update docs to mention modeladmins
Merge branch 'master' into next

* master:
  Update docs to mention modeladmins
Merge remote-tracking branch 'frog32/next' into next

* frog32/next:
  always test with the latest patch release