Add a failing test for {% app_reverse "..." "..." as reversed %}
Merge branch 'next' of git://github.com/frog32/feincms into next

* 'next' of git://github.com/frog32/feincms:
  fix the app_reverse templatetag to work in the following situation
Add notices about RichTextField and slash support to the release notes
Restructure 1.6 release notes
Improve the API docs a bit
Convert SectionContent to RichTextField
Update the SectionContent to current FeinCMS best practices
prefilling page initial doesn't override initial dict any more
The translations extension _should_ always be used with LocaleMiddleware

It's not required though.
Merge branch 'master' into next

* master:
  prefilling page initial doesn't override initial dict any more

Conflicts:
	feincms/module/page/models.py
added context_instance to front-end editing view response
Merge branch 'master' into next

* master:
  added context_instance to front-end editing view response
Fix #254: Stop special-casing image files

We don't test whether .rtf are really rich text either...
Fix #236: rebuilt_mptt should use ._tree_manager instead of .tree
Use the same thumbnail size for admin thumbnails everywhere

... except in the oldschool MediaFileContent
Fix #271: Make thumbnailer used in the administration configurable
Remove unused import
Fix #268: Separate thumbs and uploads
replaced all hardcoded mptt attributes and used references to custom mptt attributes instead
Merge branch 'tree_editor_mptt_custom_attr' of https://github.com/flyingeek/feincms into next

* 'tree_editor_mptt_custom_attr' of https://github.com/flyingeek/feincms:
  replaced all hardcoded mptt attributes and used references to custom mptt attributes instead