Add support for changelist in render_model
Update requirements
Add documentation warning for active area overlap
Merge pull request #2538 from yakky/feature/doc_fixes

Update requirements
Issue #2705 : inheritance of placeholder configuration
Merge pull request #2539 from yakky/feature/frontend_changelist

Add support for changelist in render_model
Merge pull request #2541 from DylannCordel/issue2507

inheritance of placeholder configuration
Merge branch 'develop' into fix-2482

Conflicts:
	cms/tests/toolbar.py
make the testsuite run again