Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ActivityController.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/templates/activity/activity.html