changes to JS on activity feed
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project

Conflicts:
	app/assets/javascripts/application.js
added remote true to load edit profile in right menu
Merge branch 'master' of github.com:samuel-hill/ga-wdi-rss-project