added error handling  to the file upload parts
and modified the sidebar navigation list in the report part
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/reportNavigation.jsp