FeinCMS v1.6.4
Merge branch 'master' into next

* master:
  FeinCMS v1.6.4

Conflicts:
	feincms/__init__.py
Fix #382: Do not crash if video URL could not be parsed