Fix: checkstyle
Merge branch 'Upstream/develop'
Shop - Bad language file ("boutique" instead of "shop") & add language key