Merge branch 'master' of github.com:ant-wireless/Android_ANTHALService