Lot of bluetooth refactoring
Merge branch 'master' of https://github.com/natashad/treasure