Merge branch 'develop'

Conflicts:
	TestLille1/src/fr/univ/lille1/User.java


Signed-off-by: AndroWiiid <androwiiid@gmail.com>