Django 1.5 json compatibility
Add obj parameter to get_inline_instance for django 1.5 compat
Support Django 1.5 in setup
Setup shouldn't require DJANGO_SETTINGS_MODULE to be configured
Django 1.5 custom user model compatibility

Conflicts:
	cms/models/moderatormodels.py
	cms/models/permissionmodels.py
	cms/signals.py
	cms/tests/management.py
	cms/tests/menu_page_viewperm.py
	cms/tests/publisher.py
	cms/tests/toolbar.py
Try fixing import loops
Try using old auth User model for PageUser to fix circular import
Fix PageUser inheritance
Fix error when viewing page without specifying language (use default)