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

Conflicts:
	docs/upgrade/3.0.rst