Merge branch 'master' into adam_dev
added EventId to Event.proto
added eventId to Event class and Event.proto
Merge branch 'adam_dev'