hax
Merge branch 'master' of https://github.com/Muus/photobrawler
small design fixes
small design fixes