fixed two of the tests in the activities controller
Merge branch 'master' into in_app_invites
giving up on rspec for now
most of in-app invites working
Merge pull request #41 from arieldiamond/in_app_invites

In app invites