Merge origin/master

Conflicts:
	src/Sprint1/dao/NewClass.java
Merge origin/master

Conflicts:
	src/originals/sprint1/gui/GererComptes.java
	src/originals/sprint1/gui/Interface_Client.form
Merge origin/master

Conflicts:
	src/originals/sprint1/gui/GererComptes.java
	src/originals/sprint1/gui/Interface_Client.form