adding event model
fixed merge issue
Merge branch 'master' of https://github.com/averageazn247/sample_app