Define a custom related_name in Page->Site relation
Define a custom related_name in UserSettings->User relation
Add documentation
do not go over ORM
typo fix
no message
Merge pull request #2413 from FinalAngel/develop

migration fix
do not reload after new settings are set
Merge branch 'develop' of github.com:divio/django-cms into develop
moved templatetags
Merge pull request #2349 from yakky/feature/page_related

Change related_name to Site
Merge pull request #2414 from digi604/move_palceholder_templatetags

moved templatetags
update update docs
Merge branch 'develop' of github.com:divio/django-cms into develop

Conflicts:
	docs/upgrade/3.0.rst
respect plugin language for cache
fix an issue where settings are not memorized
fix tests
fix a reload issue
fix #2385
Merge pull request #2419 from digi604/fix-plugin_fallbacks

Fix plugin fallbacks