Merge branch 'annot' into 'master'

Fix left and right annotations being swapped

See merge request !5
3 jobs for master in 21 minutes and 20 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #166543
docker
build_linux_36

00:11:48

62.0%
passed #166544
macosx
build_macosx_36

00:08:53

62.0%
 
  Deploy
failed #166545
docker
deploy_beta

00:09:25

 
Name Stage Failure
failed
deploy_beta Deploy


Traceback (most recent call last):
File "bootstrap.py", line 437, in <module>
['-n', args.envname, 'bob.devtools'])
File "bootstrap.py", line 118, in run_cmdline
(' '.join(cmd), p.returncode))
RuntimeError: command `/scratch/builds/bob/bob.db.oulunpu/miniconda/bin/conda install --override-channels --channel=http://www.idiap.ch/software/bob/conda/label/beta --channel=http://www.idiap.ch/software/bob/conda --channel=defaults -n base bob.devtools' exited with error state (1)
ERROR: Job failed: exit code 1