Merge branch 'develop' into fix-2843
Merge pull request #2873 from mkoistinen/fix_phantom_language_menu

If the language menu isn't present, don't change it.
fix and tests for #2843
Fixed AttributeError: 'NoneType' object has no attribute 'populate'
cleanup
cleanup2
Merge pull request #2876 from timgraham/nonetype_populate

Fixed AttributeError: 'NoneType' object has no attribute 'populate'
Merge pull request #2874 from digi604/fix-2855

fixes #2855 (sub menu bug)
Merge pull request #2871 from FinalAngel/develop

Tree and Sideframe changes
Merge pull request #2875 from digi604/fix-2843

Fix 2843 (placeholder permissions fix)
bumps version to 3.0b4.dev13
adds commit hash for 3.0b4.dev13
fixes #2879
Merge pull request #2883 from digi604/fix-2879

fixes #2879 (publish and unpublish keep language and page_id)
fixes #2697
Merge branch 'develop' into ojii-fix-1767

Conflicts:
	cms/tests/i18n.py
merge fix
Merge pull request #2884 from digi604/fix-2697

fixes #2697 (out of order menu manipulations)
Merge pull request #2886 from digi604/fix-1767

Fix 1767
fixes #2885