Experiment with modeltranslation app
Update translation, not work
Implemented modeltranslation in geonode
Add translation.py to maps and layers
Merge branch 'dev' of https://github.com/GeoNode/geonode into model_translation
Add django-modeltranslation to setup.py
Merge branch 'master' of github.com:GeoNode/geonode into issue-892

Conflicts:
	geonode/settings.py
Fix a few issues causing tests to fail
Merge branch 'master' of github.com:GeoNode/geonode into model_translation

Conflicts:
	setup.py
remove commented out lang fields
Merge branch 'i18n' into model_translation

Conflicts:
	geonode/settings.py
Merge branch 'issue-892' of github.com:jj0hns0n/geonode into model_translation
Add MODELTRANSLATION_DEFAULT_LANGUAGE to settings.py
Some updates to translations.py modules
Further work on model_translations
Add translation config for base models
Allow descriptions to be ditable in geonode/base/models
Merge branch 'master' of github.com:GeoNode/geonode into model_translation

Conflicts:
	geonode/base/models.py
	geonode/layers/tests.py
	geonode/settings.py
fix errant merge
fix errant merge