Merge remote-tracking branch 'pf/master'
Merge branch 'master' of https://github.com/ilya3d/lostpets
fix map resie