Merge origin/master

Conflicts:
	src/offrecomponents/PanelSaisie.java
	src/projetoffre/CompType.java
	src/projetoffre/Competence.java
	src/projetoffre/Region.java