Merge branch 'develop' of github.com:divio/django-cms into fixes/2714
fix an issue with sideframe resize event for redirect page
added screenblock feature
adds some check for #2706
fixes issue #1308
fix tests
fix an issue with sideframe resize event for redirect page
Merge branch 'FinalAngel-fixes/2714' into fix-2714

Conflicts:
	cms/views.py