Fixed webservice return
Merge branch 'master' into vendor_ui
Adjusting event info