Merge pull request #67 from Kae7in/admin_page

Admin page
Merge branch 'master' into admin_page