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.
Updated add_view and change_view to reflect change_view signature change in Django 1.4b. This should work in the future if signatures changes again.
Use of kwargs only (without args) should be safe, because admin views are called using keyword arguments.
Use _default_manager rather than objects in the datepublisher.
Fixed a KeyError when apps listed in INSTALLED_APPS are imported more than once.

E.g. nexus.autodiscover()
siblings_along_path_to: If the current node is not in the tree, it should show at least the top level navigation, so extract top level and always include that in the result set.
We do not need the /media/ lines in the MANIFEST.in file anymore
Merge remote-tracking branch 'mjtamlyn/patch-1' into next

* mjtamlyn/patch-1:
  Use _default_manager rather than objects in the datepublisher.
ItemEditor: Be a bit more future proof by passing more values as keyword arguments
Merge remote-tracking branch 'alexgula/master' into next

* alexgula/master:
  Updated add_view and change_view to reflect change_view signature change in Django 1.4b. This should work in the future if signatures changes again. Use of kwargs only (without args) should be safe, because admin views are called using keyword arguments.
Merge branch 'master' into next

* master:
  ItemEditor: Be a bit more future proof by passing more values as keyword arguments
  Fixed a KeyError when apps listed in INSTALLED_APPS are imported more than once.

Conflicts:
	feincms/admin/item_editor.py
Merge remote-tracking branch 'DrMeers/next' into next

* DrMeers/next:
  Use optional FEINCMS_UPLOAD_PREFIX setting for ImageContent / FileContent. Also, increase Image/FileField limits to 255 characters; they often blow >100.
  CSS class on div rather than img for ImageContent default.html
  Missing sphinx quote.
  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?
  Pretty buttons for ImageContent, FileContent and VideoContent by default.

Conflicts:
	docs/releases/1.5.rst
Convert ImageContent to use the bundled thumbnail functions instead

They might not be the best thumbnail functions around, but we do not
want to endorse a particular 3rd party thumbnail library for now.
Merge remote-tracking branch 'official/next' into next

* official/next:
  ItemEditor: Be a bit more future proof by passing more values as keyword arguments
  We do not need the /media/ lines in the MANIFEST.in file anymore
  Fixed a KeyError when apps listed in INSTALLED_APPS are imported more than once.
  Use _default_manager rather than objects in the datepublisher.
  Updated add_view and change_view to reflect change_view signature change in Django 1.4b. This should work in the future if signatures changes again. Use of kwargs only (without args) should be safe, because admin views are called using keyword arguments.
Add some migration instructions for the new ImageContent