added ActivityStream Module
added activitystream loader
adding a bunch of console messages to try and track down this craziness
Merge branch 'develop' of github.com:natgeo/modules-activitystream into develop
Merge branch 'develop' of github.com:natgeo/modules-activitystream into fs/UserModel

Conflicts:
	app/scripts/main.coffee
Merge branch 'develop' of github.com:natgeo/modules-activitystream into fs/UserModel

Conflicts:
	app/scripts/main.coffee
solved problem with models copying over themselves
solved problem with models copying over themselves
spaced out var in handlebars activity template
small fix to get things to show up correctly
Merge branch 'develop' into feature/scss-structure-init

Conflicts:
	app/scripts/templates/activity.hbs