Fix a typo
render_placeholder … as … no longer renders the toolbar bits.
Fix failing test.
Fix docs building
Update docs
Update docs accordingly
Merge pull request #3312 from yakky/feature/fix_docs

Fix docs building
Merge pull request #3310 from divio/Fix_3201

Fix 3201
Added warning about x-frame-options DENY breaking toolbar
Re-worded for clarity
Added more general information on x-frame-option issues
check for django.jQuery existence before using it
Updated rst formatting
Fixed casing of django CMS
Merge pull request #3318 from maestrofjp/develop

DOCO - Added warning about x-frame-options DENY breaking toolbar
Merge pull request #3319 from xavfernandez/develop

check for django.jQuery existence before using it
Add class to modal window body
Merge pull request #3322 from yakky/feature/modal_class

Add class to modal window body
Merge remote-tracking branch 'upstream/develop' into issue-3308