Merge branch 'develop' of git://code.sat.qc.ca/blobserver into air
trainer changes by manu
Merge branch 'air' of https://github.com/evsc/blobserver into air