Define a custom related_name in Page->Site relation
Define a custom related_name in UserSettings->User relation
Add documentation
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