Updated messages
Fixed translation problem in upload templates
Merge branch 'master' of github.com:GeoNode/geonode
Merge branch 'master' of github.com:GeoNode/geonode