Merge branch 'master' of
https://github.com/massimilianopolito/AutonomyProject.git

Conflicts:
	AutonomyReportProject/WebContent/pages/header.jsp
Merge branch 'master' of
https://github.com/massimilianopolito/AutonomyProject.git