Admin Page updated
Fixed conflicts from merge

Conflicts:
	src/Admin/Index.html