FeinCMS v1.6.6

The tarball-was-broken release.
FeinCMS v1.7.4

The tarball-was-broken release.
Merge branch 'master' into next

* master:
  FeinCMS v1.6.6

Conflicts:
	feincms/__init__.py