unlockPin now returns unlocked version of pin for local state
fixed merge conflict
Merge branch 'develop' of github.com:nrhinnant/GeoPost into develop