Canard et vandange en sopalin
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/src/types/JobGui.java