action performed US1
action performed US1
Merge origin/develop into develop

Conflicts:
	genindexe/nbproject/project.properties
	genindexe/src/Interface/Add_Categorie_Interface.java
	genindexe/src/Interface/CreateOrder_addcustomer.form
	genindexe/src/Interface/CreateOrder_addcustomer.java
	genindexe/src/Interface/CreateSpecie.java
	genindexe/src/Interface/US1.java
	genindexe/src/ManagedBeans/Database.java