Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Videolab/AnnotatieBundle/Controller/AppController.php
Update