Added event model
updated app
Merge branch 'master' of github.com:pennappslabs/Events