Merge remote-tracking branch 'origin/master'

Conflicts:
	titan-shippment/src/model/agglomeration/InterfaceAgglo.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	titan-shippment/src/model/planning/InterfacePlanning.java
Merge branch 'master' of https://github.com/LeonardA-L/hm-devOO

Conflicts:
	titan-shippment/src/model/planning/InterfacePlanning.java
Merge branch 'master' of https://github.com/LeonardA-L/hm-devOO