Changes to make work on PDC
Merge branch 'dev' of ssh://source.bionimbus.org/home/git/osdcquery into dev