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