handle the special case .shp.xml metadata naming convention
docs for geoserver dbclient configuration

refs #123
put back keyword region as optional field
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge pull request #954 from ischneider/iss-123-add-dbclient-docs

docs for geoserver dbclient configuration
Merge pull request #953 from simod/issue-921

handle the special case .shp.xml metadata naming convention
Merge branch 'master' of https://github.com/GeoNode/geonode into dev

# By Simone Dalmasso (2) and Ian Schneider (1)
# Via Ariel Núñez (2) and Simone Dalmasso (2)
* 'master' of https://github.com/GeoNode/geonode:
  put back keyword region as optional field
  docs for geoserver dbclient configuration
  handle the special case .shp.xml metadata naming convention