changed activity model types
Merge branch 'master' of https://github.com/kfreedland/CS169GAP