by xlzou:我的界面
by xlzou:冲突解决
Merge branches 'master' and 'master' of https://github.com/oppcat/CoProject

Conflicts:
	GoodWishes.xcodeproj/project.pbxproj
	GoodWishes/Classes/Controllers/Initiate/InitiateHomeViewController.m
	GoodWishes/Classes/Controllers/Mine/MineHomeViewController.m
	GoodWishes/Classes/Controllers/Mine/MineHomeViewController.xib
	GoodWishes/Classes/Controllers/Mine/MyActionViewController.m
	GoodWishes/Classes/Controllers/Mine/MyActionViewController.xib
Merge branch 'master' of https://github.com/oppcat/CoProject