-
Merge branch 'master' of https://github.com/Bilb/RED

Conflicts:
	src/utbm/lo54/projet/webservice/ByLocation.java
Merge branch 'master' of https://github.com/Bilb/RED