map's code is inside in the events.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	ManagerServer/src/main/webapp/events.jsp