Admin performance issues have been fixed.

Merge branch 'release/admin'
Merge pull request #76 from timbueno/master

Admin performance issues have been fixed.