Bring in services from https://github.com/jj0hns0n/geonode/tree/contrib-refactor/geonode/contrib/services
Remote layer support progress
Use appropriate URL depending on local or remote layer
Work on service & layer registration
Fix some links, bugs
Try to handle resource, publishing calls for remote services
Move Service models back to contrib.services
Update model references
Merge branch 'master' into remotelayers
Redo register_layers url
Start work on ogp integration
Merge branch 'master' into remotelayers
More remote coding
services work
Pass uuid instead of name to JS functions for adding layers to map
Merge branch 'master' into remotelayers

Conflicts:
	src/GeoNodePy/geonode/proxy/views.py
Indicate on layer page if it is remote
.
Update gxp
Merge branch 'master' into remotelayers
Merge remote-tracking branch 'origin/remotelayers' into simpler

Conflicts:
	dev/requirements.txt
	geonode/maps/owslib_csw.py