commm
Merge branch 'master' of https://github.com/MapYou/MapYou.git

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