Elena
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G3

Conflicts:
	Servlets/WebContent/UserInputOnly.jsp