Merge origin/master

Conflicts:
	src/smartravel/dao/Annonce_voyageDAO.java
	src/smartravel/gui/Inscription_Agence_Form.form
	src/smartravel/gui/Inscription_Agence_Form.java
Merge origin/master

Conflicts:
	src/smartravel/dao/Annonce_voyageDAO.java
	src/smartravel/gui/Inscription_Agence_Form.form
	src/smartravel/gui/Inscription_Agence_Form.java
Merge origin/master

Conflicts:
	src/smartravel/dao/Annonce_voyageDAO.java
	src/smartravel/gui/Inscription_Agence_Form.form
	src/smartravel/gui/Inscription_Agence_Form.java
Merge origin/master

Conflicts:
	src/smartravel/dao/Annonce_voyageDAO.java
	src/smartravel/gui/Inscription_Agence_Form.form
	src/smartravel/gui/Inscription_Agence_Form.java
Merge origin/master

Conflicts:
	src/smartravel/dao/Annonce_voyageDAO.java
	src/smartravel/gui/Inscription_Agence_Form.form
	src/smartravel/gui/Inscription_Agence_Form.java