Merge branch 'master' of github.com:reliv/RelivSkeletonApplication into custToDist

Conflicts:
	application/module/RcmShoppingCartPlugins/RcmDistributorApp/src/RcmDistributorApp/Controller/PluginController.php