fix const correctness in Locker, add deference operator
Merge branch 'master' of https://github.com/HeliumProject/Platform