remove unnecessary spaceless
fixes issue #2633
revert changes
add everything within one line
Merge pull request #2711 from FinalAngel/fixes/2616

remove unnecessary spaceless
Merge pull request #2713 from FinalAngel/fixes/2633

fixes issue #2633
Merge pull request #6 from FinalAngel/fixes/2514

check for refresh redirect on iframe reload
tests
tests
Merge branch 'develop' into fix-2514

Conflicts:
	cms/static/cms/js/plugins/cms.modal.js
fix conflicts