jelles commit
Merge branch 'traveller' of https://github.com/00stefan00/ITACT_GetConnected into traveller

Conflicts:
	res/layout/activity_transport_result.xml
	res/values/strings.xml
Merge branch 'traveller' of https://github.com/00stefan00/ITACT_GetConnected into traveller