got dialog box to pop up for navigation.
Merge remote-tracking branch 'upstream/master' into js-fix-for-url
got dialog box to pop up for navigation.
got dialog box to pop up for navigation.
got dialog box to pop up for navigation.
composer update
Merge remote-tracking branch 'upstream/master' into js-fix-for-url
Merge remote-tracking branch 'upstream/master' into js-fix-for-url

Conflicts:
	RcmAdmin/public/js/jquery-dialog-inputs.js
fixed autocomplete
Merge remote-tracking branch 'upstream/master' into js-fix-for-url

Conflicts:
	RcmAdmin/public/js/jquery-dialog-inputs.js
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