migrations and some test fixes
Merge branch 'develop' into no_i18n_apphooks

Conflicts:
	CHANGELOG.txt
first steps at python 3 compatibility
Merge remote-tracking branch 'origin/develop' into 3000

Conflicts:
	cms/admin/pageadmin.py
tests start running on 3.3 now
fixed metaclasses
more Python 3.3 compatibility

Moved cms.utils.compat.string_types to cms.utils.compat.type_checks
Added cms.utils.compat.type_checks.int_types
Fixed lots of response.content issues (now bytes)
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000

Conflicts:
	cms/cms_toolbar.py
	cms/toolbar/items.py
	cms/toolbar_pool.py
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000
fixed plugin test using str instead of bytes
loads of str/bytes issues fixed
ported all __unicode__ methods
more str/bytes fixes, unittest compat
another unittest compat fix
use assertSequenceEqual instead of assertListEqual
fixed last two errors (import issue in inherit)
fixed last failing test. all tests pass on 3.3
tests pass on 2.7 again
runtestserver python 3 ready
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000

Conflicts:
	cms/tests/frontend.py
Merge remote-tracking branch 'ojii/toolbar-api' into toolbar-3000

Conflicts:
	cms/cms_toolbar.py
	cms/toolbar/items.py