Settings and Customers fixes
Merge branch 'dev' of https://github.com/VirtoCommerce/vc-community