Merge branch 'master' of https://github.com/JavierLight/ANDROID-HiLightStudio

Conflicts:
	AcelerometroXYZ