updated eventController and annotations in service
Merge branch 'master' of https://github.com/amarbayar/jams