CATEGORY LIST (no plugins used)
Merge remote-tracking branch 'upstream/master' into categoriesList

Conflicts:
	RcmAngularJs/public/ng-tags-input/ng-tags-input.js
Merge pull request #128 from innaDa/categoriesListNoPlugins

Categories list no plugins
Merge remote-tracking branch 'upstream/master' into plugin-properties
fix category removal when still has products