Fix use of OGC_SERVER location
Handle for local layers without a service
fix ptype references
Added services in template if it is installed.
Added a link to register a new service.
Removed service relation in layer, now we have a m-m relation via ServiceLayer.
Merge branch 'services-redux-paolo' of https://github.com/capooti/geonode into services-redux
Fix a few things after applying @capooti's patch to use m2m for Service<->Layer
Make services optional
Only include services urls if the module is enabled
Switch to GEONODE_APPS method for running tests
Safely handle activities with non-actionable parameters.
Merge branch 'master' of github.com:GeoNode/geonode into services-redux

Conflicts:
	geonode/context_processors.py
	geonode/templates/base.html
Add arcrest to install_requires
Fix merge problem
Added arcrest to setup.py
remove
Fixed conflicts in groups and services integration
Removed print statement in services test
Merge pull request #16 from ingenieroariel/jj0hns0n-services-redux

Updates to services branch