Merge pull request #126 from bjanish/js-fix-for-url

Js fix for url
fix people slider edit
Merge pull request #127 from rodmcnew/plugin-properties

fix people slider edit
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
convert jquery alert-confirm to bootstrap
Merge remote-tracking branch 'upstream/master' into plugin-properties
fix category removal when still has products
Merge pull request #129 from rodmcnew/plugin-properties

convert jquery alert-confirm to bootstrap
Added basic fake toolbar for rcmHtmlEditor
Merge remote-tracking branch 'upstream/master'
Merge pull request #130 from jerv13/master

Added basic fake toolbar for rcmHtmlEditor
Update html editor with default fake toolbar
Merge remote-tracking branch 'upstream/master'
Merge pull request #131 from jerv13/master

Update html editor with default fake toolbar
Fixed css issue that showed too much white space under footer when tabbed player was empty on product pages