updated edisense types
moved GetResult
Merge branch 'master' into comms

Conflicts:
	include/edisense_types.h