version beta map generale
Merge branch 'master' of
https://github.com/Valkyria/VirtualVisitApplication.git

Conflicts:
	VirtualVisitApplication-android/assets/data/map/map.tmx