Add OMERO toolbox to compiled version on PC
Merge branch 'master' into develop