making fixes per ross request
Merge branch 'master' of https://github.com/tonyseing/lifescan_canada