halloween bat
handle case where a profile trophy as a nil profile_id
enable activity feed by get param only
Merge remote-tracking branch 'origin/master' into develop
implemented bats
Merge branch 'halloween' into develop
asset compile
change dir of activty feed
asset compile
bats now follow your cursor if it inside the window
Merge branch 'halloween' into develop
asset compile
update activity feed
update activity feed
Merge branch 'develop'

Conflicts:
	public/production/manifest.yml
update activity feed
Change activity feed dir
fix pagination for activity feed
fix pagination for activity feed
setting up activity feed scroll
Merge remote-tracking branch 'origin/develop' into petes_purple_site

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/layouts/application.html.haml