merge
merge
merge
merge
merge
merge
Merge branch 'master' of https://github.com/Hoshiyo/IHM

Conflicts:
	src/com/esiea/ihm/controller/AddressController.java
JUnit Test

JUnit test of entity and DAO