PROBCORE-404 Fixed bug in adding machines/contexts to EventBModel
PROBCORE-425 Implemented sorting for events in Events view
Merge remote-tracking branch 'origin/develop' into develop