Merge branch 'master' into 1.0

bin/backend/controls/Comments.js

bin/frontend/controls/frontendUsers/VatType.js

composer.json

locale.xml

src/QUI/ERP/Accounting/Calc.php

src/QUI/ERP/Accounting/PriceFactors/Factor.php

src/QUI/ERP/EventHandler.php

src/QUI/ERP/FrontendUsers/createAddressBegin.html

src/QUI/ERP/FrontendUsers/createAddressEnd.html

src/QUI/ERP/FrontendUsers/customerData.html

src/QUI/ERP/FrontendUsers/editAddressBegin.html

src/QUI/ERP/FrontendUsers/editAddressEnd.html

src/QUI/ERP/FrontendUsers/profileData.html

src/QUI/ERP/Money/Price.php

src/QUI/ERP/User.php

src/QUI/ERP/Utils/Shop.php

src/QUI/ERP/Utils/User.php

template/user/erpSettings.html

user.xml