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

Conflicts:

MiuTrip/MiuTrip/MyClass/ViewControllers/Hotel/HotelChooseViewController.
h

MiuTrip/MiuTrip/MyClass/ViewControllers/Hotel/HotelChooseViewController.
m

MiuTrip/MiuTrip/MyClass/ViewControllers/Hotel/HotelSelectViewController.
h

MiuTrip/MiuTrip/MyClass/ViewControllers/Hotel/HotelSelectViewController.
m