uyy
Merge remote-tracking branch 'origin/master'vv

Conflicts:
	Project/workspace/MapYou/src/it/mapyou/view/CompleteMapMeFirstTab.java
	Project/workspace/MapYou/src/it/mapyou/view/ServiceConnection.java