Merge remote-tracking branch 'mjl/next' into next

* mjl/next:
  MediaFile Category Admin: Add validation to "parent" field so one cannot create loops.
  Add a note how to implement a Media inner class in own content types.
  Documentation: Add missing trailing comma for tuple in example.

Conflicts:
	feincms/module/medialibrary/modeladmins.py
Improve previous fix, don't offer a loop candidate in the first place.
Merge remote-tracking branch 'upstream/next' into next
Actually use the correct queryset for the drop down.
Fix #259: Installation location of data files (package data) in setuplib

Change setuplib.find_files to return package_data instead of data_files.

Big thanks to PSyton for the report and the suggestion how this issue
should be fixed.
Setuplib: find_packages is a better name for this method
Include setuplib.py in MANIFEST.in

Thanks to PSyton for the report.
Merge remote-tracking branch 'mjl/next' into next

* mjl/next:
  Actually use the correct queryset for the drop down.
  Improve previous fix, don't offer a loop candidate in the first place.
  Update translations.
feincms_navigation needs to deal with parents being inactive, issue #260.

This is a stopgap measure for the most common case, but doesn't cover the case if active_filters has been extended.
Use RequestContext for MediaFileContent so we get all the TEMPLATE_CONTEXT_PROCESSORS goodness.
Improve previous by using the context passed in from the content renderer.
Also pass in context in other content types.
Add a blurb about the context availability to the release notes
FeinCMS v1.5.2

Be compatible with Django 1.4c1
Merge branch 'master' into next

* master:
  FeinCMS v1.5.2

Conflicts:
	feincms/__init__.py
Start cleaning up test suite.
Merge remote-tracking branch 'refs/remotes/upstream/next' into next
Add test to check if deactivating intermediate page also removes children from navigation.
Start separating the rather unwieldy tests.py into smaller parts.
More splitting out tests.