Commit Servlet
Commit
Merge branch 'master' of https://github.com/johneisenheim/Placement

Conflicts:
	APIServer/ServerWeb/nbproject/project.properties
	APIServer/ServerWeb/web/_offertaFormativaStudente.html
	APIServer/ServerWeb/web/login.html
Merge branch 'master' of https://github.com/johneisenheim/Placement