bisschen checkstyle
Merge branch 'master' of https://github.com/hafl1016/shop-repo1.1.git