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

Conflicts:
	admin.php