修改应用图标等
Merge branch 'master' of https://github.com/lovesunstar/MyTourGuide

Conflicts:
	MyTourGuide.xcodeproj/project.pbxproj
	MyTourGuide/Base.lproj/Main.storyboard
	MyTourGuide/UI/Profile/TGRecordVC.m