further work towards 14.04
Merge branch 'master' of https://github.com/GeoNode/geonode