resolve aff_lab
Merge branch 'master' of https://github.com/SceauRond/cartographer
bloub
Conflicts:
	dedale
bloub