Fixed ShopConfiguration CSS Merging-Flag, added _cssClasses to ShopStatus check
Merge remote-tracking branch 'origin/master'
removed empty line