Map added
Merge branch 'traveller' of https://github.com/00stefan00/ITACT_GetConnected into traveller

Conflicts:
	res/values/strings.xml
	src/com/example/getconnected/MapActivity.java