Merge origin/dev into dev

Conflicts:
	src/megacasting/MegaCasting.java
	src/megacasting/dao/SocieteDAO.java
	src/megacasting/dao/TypeContratDAO.java