Web Api calls and Javascript module setup
merge conflict in event service
merge conflict in event service