#7: Admin Panel Design
Merge branch 'master' into parvaj