Merge branch 'dev' of github.com:GeoNode/geonode into jsclean
Uncomment announcements context processor
Merge branch 'dev' of github.com:GeoNode/geonode into geoexplorer
map title template, change on save
Merge branch 'geoexplorer' of git://github.com/jj0hns0n/geonode into geoexplorer

Conflicts:
	geonode/maps/templates/maps/map_view.html
Update TODO
clean up html template
Merge branch 'geoexplorer' of git://github.com/bartvde/geonode into geoexplorer
add a layer info plugin to layer tree
Update TODO
Fix up map_detail.html template
Update TODO
add in search to the composer
remove duplicate code block
safeguard layer.supplemental_information
make sure records from search can be shown with layer info plugin as well queried with WMSGetFeatureInfo
make sure that layers added by search can be saved
fix up i18n
fix #534 - return correct bbox in search results

- resolve an omission from the initial porting work
- ensure internal error results in a 500 response
- minor cleanup
exclude uuid, bbox fields, srid, csw fields, popular and share counts from map metadata