nothing
menu bug fixed.
added address to event
Evacuation details and registration were updated
Search is partially on
containers line up
Merge branch 'master' of https://github.com/arikfe/236369Project.git

Conflicts:
	.classpath
	src/main/webapp/CSS/addReport.css
	src/main/webapp/CSS/allReports.css
	src/main/webapp/JS/allReports.js
	src/main/webapp/JS/menu.js
	src/main/webapp/WEB-INF/pages/addEventView.jsp
	src/main/webapp/WEB-INF/pages/evacuation.jsp
working version