basic admin split working :)
advanced setting form working
basic and advanced settings working
Merge branch 'develop' into pagesettings
permissions
Merge branch 'develop' into pagesettings

Conflicts:
	cms/cms_toolbar.py
cleanup
fixed some tests
Merge branch 'develop' into pagesettings

Conflicts:
	CHANGELOG.txt
	cms/admin/pageadmin.py
Merge branch 'develop' into pagesettings
Merge pull request #1849 from FinalAngel/develop

Frontend Fixes
configuration docs mainly
amended inherit template option text in English
contribution guide amended
Updated frontend tests to account for toolbar classes name change
Modified requirements and configuration for selenium tests to run on travis
Fixed leak in frontend tests
removed deletion commands for meta_keywords field which has been deleted
already in 0040
Open the settings overlay for the current page language.
Merge pull request #1862 from Markush2010/develop

Open the settings overlay for the current page language.