Merge pull request #15 from shiaho/master

Fix admin error
Merge pull request #1 from graphite-ng/master

Merge pull request #15 from shiaho/master