rebiuld admin instance config api
Merge remote-tracking branch 'upstream/master' into plugin-properties
fix people slider
Merge pull request #116 from rodmcnew/plugin-properties

fix people slider