Worked on the Annotation Model.
Merge branch 'master' of github.com:tomayac/postdoc

Conflicts:
	papers/read-write-online-semantic-video-annotation/references.bib