activityDetail
Merge branch 'origin/master'

Conflicts:
	public/activity-detail.html