Updated Admin
Merge branch 'master' of https://github.com/agulen/EntertainMe