Improvements in map detail, layer detail layout. Fix document upload layout.
Fix Documents Upload extended template
Adding id to upload button (for styling purposes)
Merge pull request #1498 from ppasq/api-search

Improvements in map detail, layer detail layout.
make upload working
Merge branch 'master' of https://github.com/GeoNode/geonode into guardian

Conflicts:
	geonode/templates/_permissions_form.html
Fix permission modal in layer detail
Merge pull request #1499 from ppasq/api-search

Fix permission modal in layer detail
Merge branch 'master' of https://github.com/GeoNode/geonode into guardian
make layers tests to pass