bugfix + design
Merge branch 'master' of https://github.com/Hanyken/AdroidShopClient
design