stam
Merge branch 'master' of https://github.com/kfirt/BlindPhone.git
bug fixes