Padlock WIP
Merge branch 'master' of https://github.com/prkc/lost-bazaar