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
Avoid expensive permission checks if CMS_VIEW_PERMISSION is False
Fix PageUser inheritance
Merge branch 'develop' into perf
Fix error when viewing page without specifying language (use default)
Merge branch 'develop' into perf
Fixed: Infinite recursion when creating new page
fix plugin content not getting saved under django 1.5 (500 error calculating reverse url for admin:cms_page_edit_plugin view) refs divio/django-cms#1519
Merge branch 'ntucker-perf' into develop

Conflicts:
	cms/admin/pageadmin.py