start on activity feed
Merge remote-tracking branch 'origin/develop' into Feature_ActivityStream

Conflicts:
	app/assets/javascripts/controllers/pages.js.coffee
add in a activity feed