Fix typo in test function
Fix typo in templatetag documentation
fixed redirect after publishing home page for the first time
Merge branch 'develop' of git://github.com/divio/django-cms into develop
show plugin modal on edit button click in structure mode
Merge remote-tracking branch 'divio/develop' into develop
Merge branch 'develop' of github.com:o-zander/django-cms into develop
Merge remote-tracking branch 'divio/develop' into develop

Conflicts:
	cms/admin/pageadmin.py
Merge remote-tracking branch 'divio/develop' into develop
added page- & title extension models & admins
fixed wrong function name in title extensions
created docs for extending page & title model
small improvements to the extension doc
added single & multi title extension models
Merge branch 'develop' of github.com:o-zander/django-cms into develop
Fixed {% render_plugin %} example

The instance.child_plugins reference is not correct, it should be instance.child_plugin_instances.
Merge pull request #2045 from andreiavram/patch-1

Fixed {% render_plugin %} example
merge
changed extensions workflow, work in progress
Merge branch 'feature/fixes' of github.com:FinalAngel/django-cms into develop