default settings if not available
testcases fixed
data migration
fixed some templates and permissions
Merge pull request #1783 from digi604/copypaste

New copy paste API and clipboard
fixes issues with nested for loops
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge pull request #1785 from FinalAngel/develop

Frontend Enhancements
fixed a bug with wrong edit-off url redirect after publishing
added missing import
Merge pull request #1786 from alesdotio/develop

added missing import
call urlify only if there is something to urlify
(otherwise, js breaks when URLify is not imported)
Merge branch 'develop' of github.com:divio/django-cms into develop
- added new plugin delete api
- added new placeholder clear api
- made the draft mode more reliable
Merge branch 'develop' of github.com:divio/django-cms into develop

Conflicts:
	cms/templatetags/cms_tags.py
added firther draft for copy/paste
add ckeditor and admin style as default in example project
Merge branch 'develop' of github.com:divio/django-cms into develop
readd delete logs
added mire z-index fixes