refactored Activity and User models to facilitate better facebook queries
Merge branch 'master' into koala