Bumped to 2.0a7
Updated changelog
Merge branch 'master' of github.com:GeoNode/geonode
Reset version on master in preparation for beta