2
Merge branch 'master' of https://github.com/spensko/HumScan

Conflicts:
	HumScan/HMRWorkersViewController.m