Merge branch 'master' of gitorious@git.sugarlabs.org:log/mainline

Conflicts:
	NEWS
	activity/activity.info

Conflicts:
	NEWS
	activity/activity.info
