Fix #373: Video embedding on SSL-secured websites
Merge branch 'master' into next

* master:
  Fix #373: Video embedding on SSL-secured websites

Conflicts:
	feincms/templates/content/video/vimeo.html