Merge pull request #2794 from digi604/pagetypes

page types
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' into fix-2788

Conflicts:
	cms/admin/pageadmin.py
Merge pull request #2799 from FinalAngel/develop

Cleanups
fix tests
Merge branch 'develop' into fix-2788
Merge pull request #2807 from digi604/fix-2788

limit detection of model changes
Merge pull request #2808 from digi604/fix-2797

Fix 2797 (multisite static placeholders)
return empty for not logged in users
disable code
improve for jslint
fix tests
fix an issue with arrow having no padding
fixes issue #2809
Merge branch 'develop' of github.com:divio/django-cms into develop
Merge pull request #2811 from FinalAngel/develop

Positioning and visual fixes
fix typo
add correct url to unpublish
Merge pull request #2812 from FinalAngel/develop

Fix unpublish link
fixes issue #2810