Added HttpService to events
Merge branch 'events' into develop