Fixed map and link for admin chat
Merge remote-tracking branch 'origin/master'

Conflicts:
	Website/admin.html