rename the activity template folder to actstream
Merge branch 'master' of https://github.com/GeoNode/geonode