ajout barre progression projet ted commencement ajout projet
Merge origin/develop into develop

Conflicts:
	src/java/beans/Client.java
Merge origin/develop into develop

Conflicts:
	src/java/beans/Client.java