got dialog box to pop up for navigation.
Merge remote-tracking branch 'upstream/master' into js-fix-for-url
JS updates
Merge remote-tracking branch 'upstream/master'
got dialog box to pop up for navigation.
Update refresh for angular
rebiuld admin instance config api
Edit mode update
Merge pull request #115 from jerv13/master

Admin JS updates
Merge pull request #113 from wshafer/master

Completed new page admin menu.
Merge remote-tracking branch 'upstream/master' into plugin-properties
fix people slider
got dialog box to pop up for navigation.
Merge pull request #116 from rodmcnew/plugin-properties

fix people slider
Update js for admin
Merge remote-tracking branch 'upstream/master'
Merge pull request #117 from jerv13/master

Update js for admin
got dialog box to pop up for navigation.
Fix editor issue
Fix toolbar issue