烦烦烦

烦烦烦
Merge branch 'master' of https://github.com/niufuwei/eliuyan

Conflicts:
	EliuYan/EliuYan.xcodeproj/project.pbxproj
	EliuYan/EliuYan/AppDelegate.h