cc
Merge branch 'master' of https://github.com/chengxd/Miutrip

Conflicts:
	MiuTrip/MiuTrip.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/chengxd/Miutrip

Conflicts:
	MiuTrip/MiuTrip.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/chengxd/Miutrip

Conflicts:
	MiuTrip/GetDistrictsRequest.h
	MiuTrip/GetDistrictsRequest.m
	MiuTrip/GetDistrictsResponse.h
	MiuTrip/GetDistrictsResponse.m
	MiuTrip/MiuTrip.xcodeproj/project.pbxproj
	MiuTrip/MiuTrip/MyClass/HomeView/RegisterAndLogViewController.m