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

Conflicts:
	Gestion Competences/src/fr/imie/formation/DAO/ProjetDAO.java
	Servlets/WebContent/css/style.css