Before merge
Merge
EventDao
Merge branch 'master' of github.com:sharmana/mobile-android