Merge pull request #274 from jerv13/master

Minor tweek of admin js
Merge remote-tracking branch 'upstream/master'