Fixing merge conflicts
Fixing merge conflicts
Merge branch 'vb547' of https://github.com/balabhv/iSENSE-Hardware into vb548
Working on adding contrib keys to iOS