gggg
Merge remote-tracking branch 'origin/master'hhh

Conflicts:

	Project/workspace/MapYou/src/it/mapyou/view/CompleteMapMeLayoutHome.java