Merge branch 'master' into python3
Make fiber compatible with python 3
Use assertEqual instead of deprecated assertEquals
Use six.add_metaclass for JSONField
Don't check result of get_used_on_pages_json
Added python 3.3 to tox.ini; also updated Django versions
Added python 3 to travis config; also updated Django versions
Merge branch 'python3' into multilingual

Conflicts:
	.travis.yml
	fiber/admin.py
	fiber/admin_forms.py
	fiber/middleware.py
	fiber/models.py
	fiber/tests.py
	setup.py
	testproject/tox.ini