fixed conflict
bt device polling implemented
merged with develop, fixed conflicts
fixed careless typo
Mergine devicelist
Merge branch 'develop'