update to enable data import - is not complete yet
merging
pom
Merge branch 'master' of https://github.com/arikfe/236369Project.git
Merge branch 'master' of https://github.com/arikfe/236369Project.git

Conflicts:
	pom.xml
	src/main/java/com/technion/project/controller/MainController.java
	src/main/webapp/JS/allReports.js
	src/main/webapp/WEB-INF/pages/allReport.jsp
Merged
Merge branch 'master' of https://github.com/arikfe/236369Project.git

Conflicts:
	src/main/webapp/WEB-INF/pages/addReport.jsp
load from Json file is alive
Merge branch 'master' of https://github.com/arikfe/236369Project.git

Conflicts:
	src/main/webapp/WEB-INF/pages/menu.jsp
tmp
Merge branch 'master' of https://github.com/arikfe/236369Project.git

Conflicts:
	src/main/webapp/WEB-INF/pages/menu.jsp