Merge pull request #1497 from ppasq/api-search

Upgrade font awesome to version 4.1
Replaced placeholder text
Merge branch 'master' of github.com:GeoNode/geonode
Added users and layers count to facets for homepage use
Fix facets for layer page
Added count to homepage
fix the ratings
Committed outputs from paver static
avoid showing users faceting in search
initial work towards permissions on resourcebase
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 branch 'master' of https://github.com/GeoNode/geonode into api-search

# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
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