Merge branch 'master' of github.com:feincms/feincms
Merge branch 'next' of github.com:feincms/feincms into next
Pretty buttons for ImageContent, FileContent and VideoContent by default.
Funkier ImageContent and FileContent -- see release notes.
 -- not sure if we need to worry about a migration for ImageContent,
    or add the fields conditionally. I suspect it is fine as is?
Missing sphinx quote.
CSS class on div rather than img for ImageContent default.html
Use optional FEINCMS_UPLOAD_PREFIX setting for ImageContent / FileContent.
Also, increase Image/FileField limits to 255 characters; they often blow >100.
Open 1.6 branch
Page module: Remove deprecated page and manager methods
Remove the prefilled attributes code, it has been superceded by queryset_transform etc.
Switch around the default of FEINCMS_REVERSE_MONKEY_PATCH
Merge branch 'master' into next

* master:
  1.5: Not upcoming anymore
Clarify the warnings concerning the reverse monkey patch removal (soon)
Remove the deprecated feincms.views.base module

The code has been moved to feincms.views.legacy last summer.
Start with the 1.6 release notes
Switch off frontend editing by default
ItemEditor: Be a bit more future proof by passing more values as keyword arguments
MediaLibrary ZIP Export: Don't redirect to export file if export file could not be created.
Merge branch 'master' into next

* master:
  FeinCMS v1.5.1
  Fix rich text cleansing: Assigning a function to a class makes it a bound method

Conflicts:
	feincms/__init__.py
ItemEditor: Only show available translations if the list consists of Django models

This prevents us outputting stuff just because a available_translations
method/attribute returns something in the item editor template.