fix url name error in map explore
fix document upload page layout
Merge remote-tracking branch 'simod/master' into master-search

Conflicts:
	geonode/maps/templates/maps/map_list.html