Added String to Hex Conversion
Merge branch 'master' of https://github.com/Jamesmoo/NewPumpControl

Conflicts:
	bin/classes.dex
	bin/resources.ap_