One name is enough for one thing

"You are in a maze of twisty passages, all alike"
Fix typo
Merge branch 'master' of https://github.com/GeoNode/geonode

Conflicts:
	geonode/layers/templates/layers/layer_detail.html
Preparation of setup.py for release
Committed outputs from paver static
Merge branch 'master' of https://github.com/GeoNode/geonode into api-search

# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
Instruction fix

Fixed error in that tutorial called for changing the SITEURL manually, adding port 4567, then proceeding to have you run geonodeupdate-ip with only localhost, effectively overwriting/resetting your SITEURL to just localhost (port 80).  Simplified to just running the command with the port added
Merge branch 'master' of github.com:GeoNode/geonode
Upgraded pycsw to latest
An UploadError is acceptable when a layer does not have a good projection
Fix doc detail and info panel layout
Merge branch 'master' of https://github.com/GeoNode/geonode into api-search

# By Ariel Nunez
# Via Ariel Nunez (2) and Simone Dalmasso (1)
* 'master' of https://github.com/GeoNode/geonode:
  An UploadError is acceptable when a layer does not have a good projection
  Upgraded pycsw to latest
  Preparation of setup.py for release
Fix dl-horizontal dt text-overflow
Added port to instruction

Forgot!
Fixes Filters active colors
Merge pull request #1501 from ppasq/api-search

Fixes Filters active color and general layout improvements
Improvements in profile detail layout
Merge branch 'master' of https://github.com/GeoNode/geonode into api-search

# Via Ariel Núñez
* 'master' of https://github.com/GeoNode/geonode:
Move my activities link in profile detail
Disable temporarily CSW tests