Updates to services branch

Added dependency on geonode-arcrest and fixed a few merge conflicts.