EntranceView button round
Merge branch 'master' of https://github.com/jiaoyuguanjia/jygj-ios

Conflicts:
	jygj.xcodeproj/project.pbxproj
commit
Merge branch 'master' of https://github.com/jiaoyuguanjia/jygj-ios