Merge pull request #1 from mdjordjevic/notes-poc

Measurement logic
Merge pull request #2 from mdjordjevic/notes-poc

Event preview
bug fixing
Edit event VC
submodule update
Merge pull request #3 from mdjordjevic/notes-poc

Edit event VC
merge
Merge pull request #4 from mdjordjevic/notes-poc

Event edit VC
Merge pull request #12 from mdjordjevic/master

Event edit VC