dp
Merge branch 'master' of https://github.com/WonderNewWorld/Traveller

Conflicts:
	Traveller/Traveller.xcodeproj/project.pbxproj
	Traveller/Traveller/AppDelegate.m
	Traveller/Traveller/NearShopListView.h
	Traveller/Traveller/NearShopListView.m
	Traveller/Traveller/NearShopMapView.h
	Traveller/Traveller/NearShopMapView.m
	Traveller/Traveller/NearShopVC.m