Trying to bind Annotations.
Trying to bind Annotations.
Merge branch 'master' of https://github.com/guerre50/VionLabsHack

Conflicts:
	public/js/app/templates/video.html