Merge branch 'feature/modeltranslation-integration' into develop

Conflicts:
	mezzanine/project_template/urls.py