prod list fix
Merge remote-tracking branch 'upstream/master' into categoriesList
category list that includes add, delete and save
Merge pull request #110 from jerv13/master

Fix html editor destroy
Merge remote-tracking branch 'upstream/master' into categoriesList

Conflicts:
	RcmAdmin/view/rcm-admin/admin/partial/panel/panel.phtml
Merge remote-tracking branch 'upstream/master' into categoriesList

Conflicts:
	RcmAdmin/view/rcm-admin/admin/partial/panel/panel.phtml

Merge remote-tracking branch 'upstream/master' into categoriesList

Conflicts:
	module/RcmCheckout/public/ModelFromValue.js
	module/RcmShoppingCart/public/js/admin/list-categories.js
	module/RcmShoppingCart/public/list-categories.html
Merge pull request #111 from innaDa/categoriesListAddSaveDelete

Categories list add save delete
Merge remote-tracking branch 'upstream/master'