further development
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Videolab/AnnotatieBundle/Entity/VideoAnnotation.php