minor changes committed for merge
Merge branch 'develop' of git@github.com:moritzrupp/music-shop.git into develop