finished new placement of text for researcher, including indicator of whether on manual or auto
Merge branch 'master' of https://github.com/codedragon/calibrate