David 13/09/2013 : DAO arborescence compétences.
dummy commit to revert
Revert "David 13/09/2013 : DAO arborescence compétences."

This reverts commit defbf4a43cc32ab947e60aeb9d52d325c6f7d16b.

Conflicts:

	iCompetence/src/org/imie/DAO/CompetenceDAO.java
	iCompetence/src/org/imie/DAO/interfaces/ICompetenceDAO.java
	iCompetence/src/org/imie/service/ServiceCompetence.java
	iCompetenceServlet/WebContent/inc/style.css
merge compliqué
Merge branch 'master' of http://github.com/imie-source/DLCDI08-ICompetence-G1

Conflicts:
	iCompetence/src/org/imie/DAO/CompetenceDAO.java
	iCompetence/src/org/imie/DAO/interfaces/ICompetenceDAO.java
	iCompetence/src/org/imie/service/ServiceCompetence.java
	iCompetenceServlet/WebContent/inc/style.css.orig