Merge remote-tracking branch 'upstream/master'

Conflicts:
	RcmInstanceConfig/src/RcmInstanceConfig/Controller/BasePluginController.php
    WEBCART-233 remove renderDefaultInstance
    WEBCART-233 fix getLoggedInUser calls and userMgrService to new names
Merge pull request #24 from rodmcnew/fix-global-bag

    WEBCART-233 fix getLoggedInUser calls and userMgrService to new names
    WEBCMS-114

    Make jquery module
Merge branch 'master' into fix-global-bag
    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
Merge pull request #26 from rodmcnew/fix-global-bag

    WEBCART-233      Cart product page plugins - get working with new user and use factory classes
WEBCMS-113 - Factorys and Factory tests complete for RCM
Merge remote-tracking branch 'upstream/master'

Conflicts:
	RcmPluginsCommon/Module.php
	RcmRssFeed/Module.php
Merge pull request #27 from wshafer/master

Some factories complete and misc fixes.
FIX LOGIN    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
FIX LOGIN    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
FIX LOGIN    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
FIX LOGIN    WEBCART-233

    Cart product page plugins - get working with new user and use factory classes
Merge pull request #28 from rodmcnew/fix-global-bag

FIX LOGIN    WEBCART-233