Merge branch 'rating_count'
Updated changelog for beta1
Merge branch 'master' of https://github.com/GeoNode/geonode
initial work towards storing thumbnails
make sure we tell the uploader js we are dealing with a layer
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge branch 'master' of https://github.com/GeoNode/geonode
Change 'Activities' to 'My Activities' and use trans templatetag
Merge pull request #854 from mbertrand/my_activities

Change "Activities" to "My Activities" for profiles and use trans templatetag
Merge pull request #852 from ischneider/thumbnails

initial work towards storing thumbnails
Merge branch 'master' of https://github.com/GeoNode/geonode into permissions

Conflicts:
	geonode/templates/_permissions_form_js.html