added test for #1767
Fixed #1767
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
fixed tests
Merge pull request #2887 from digi604/fix-2885

fixes #2885 (sekizai cache issue)
Fixed boolean expression that broke the CMS toolbar on non-CMS pages with static placeholders.
Merge pull request #2888 from amadornimbis/develop

Fixed boolean expression that breaks the CMS toolbar on non-CMS pages with static placeholders.
Fix publish_page missing language parameter
Smartlink field: based on the specification of Issue #2785 - point 1
Added test and adapted code based on digi604 's review
Fix failing test and python 3 compatibility fix
Add PageSmartLinkField documentation
Fix content_type