Merge branch 'master' of github.com:isenseDev/rSENSE into fixmanualmap
Merge pull request #1572 from jdalphon/fixmanualmap

Fixmanualmap