Targeting just the first h2 under #content, rather than all, this will prevent the headers of the django-form-designer inline from being hidden
refactored post template populate function
only if no page is present check for placeholders
refactored & optimized page toolbar code
Merge branch 'tempoiq' into develop
removed unused import
refactored placeholder & basic toolbar code, init placeholders post template
use django urlencode and let it handle the compatibility problems
made add url parameters a utility function
use add_url_parameters utility function
check for existing title language in on delete redirect, fix for #3270
fix for user button if auth model is swapped
Simplified urls file.
fixes issue #3308
Merge branch 'develop' into refactor-cms-toolbar-code

Conflicts:
	cms/cms_toolbar.py
modified toolbar test to pass with swapped user model
removed unused import statement to make pyflakes happy
Added warning about x-frame-options DENY breaking toolbar
Re-worded for clarity
Added more general information on x-frame-option issues