Added Activity model and Activities controller
Merge branch 'master' into koala