Commented debug messages out
Added new resource files
Fixed a bug in Calibrate
Modified FrequencyScope, TimeScope and Diagnostic to use new images
Merge branch 'master' of github.com:NeuralProsthesisLab/unlock

Conflicts:
	unlock/controller/diagnostic.py