Moved the SPATIAL_REPRESENTATION_TYPES base/enumerator to the SpatialRepresentationType model.
Moved the CONSTRAINT_OPTIONS base/enumerator to the RestrictionCodeType model. Need to figure out if it is correctly exposed in full_metadata.xml.
Merge branch 'master' of github.com:GeoNode/geonode into issue-892
Moved the COUNTRIES base/enumerator to the Region model
Added the METADATA_DOWNLOAD_ALLOWS setting
Added the gn_description and is_choice field, renamed slug to identifier and name to description (to have homogeneity with the other metadata models) in the TopicCategory model
Removed the default value from resourcebase.category, as it is a nullable field
Removing the get_default_category() method, as it is not needed anymore
Using identifier for the layer.category metadata
Now the metadata for resourceConstraints is correctly set to restriction_code_type.identifier
Fixed conflict in context_processor after merging from master
category.gn_description may be null (needed in migration). Updated the search page to use topiccategory.identifier instead than slug
Updated the gn_description of topiccategories to a shorter version in fixtures.
Now search for categories is using the identifier field (slug was replaced by identifier).
Merged latest updates from master and added the METADATA_DOWNLOAD_ALLOWS setting in local_settings.py
Added the attribute description field, to be used in metadata. Removed from now, until they will be implemented in gxp, the visible and display_order form fields in layer metadata page.
Merge branch 'master' of github.com:GeoNode/geonode into issue-892

Conflicts:
	geonode/settings.py
Fix a few issues causing tests to fail
Update i18n from transifex
makemessages/compilemessages