update
Merge branch 'master' of https://github.com/sensoro/Android-SDK

Conflicts:
	Example/Hardware.md