Merged from pull
Merge branch 'master' of https://github.com/pvbergen/ch.bfh.bti7054.w2014.p.ShareShop.git
Am Bildchen umbauen