Merge remote-tracking branch 'origin/master'

Conflicts:
	public/templates/activity/activity.html