Merge pull request #310 from desaiuditd/master

Merge branch admin-refactor