Update for UP release 15_1
Merge branch 'master' of https://github.com/calipho-sib/controlled-vocabulary