Refactors event service using a closure
Update eventService.js
Update app.js
fixes merge conflict and adds necessary changes
Merge branch 'tonekk-master'