Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into vb548
API and QR code stuff
Stuff
Merge conflicts
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into vb548
Merging Changes
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into vb548
stuff happened
Merge remote-tracking branch 'origin/bd859' into bd859
Bla
apk added
Merge remote-tracking branch 'upstream/master' into bd859
canobie app no longer requires to be resetup after each ride
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
moved all hardware related folders to subfolder Hardware
Merge pull request #1010 from AlanRosenthal/hardware-subfolder

moved all hardware related folders to subfolder Hardware
Stuff
Merge branch 'master' of https://github.com/isenseDev/iSENSE-Hardware into HEAD
fixed default project switching dev and live