petes purple site
Merge remote-tracking branch 'origin/develop' into petes_purple_site
work on great purple site
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
petes site
changed to petes id
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/petes_purple_site' into develop
run nereus file corrupted and restored,
assets compiled
merged with petes purple