Date update can add dateto expiration
Merge branch 'master' of https://github.com/arikfe/236369Project.git

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