pick
Merge branch 'Cube' of https://github.com/icylydia/YouBaoOC into Cube

Conflicts:
	YouBaoOC.xcodeproj/project.pbxproj
	YouBaoOC/Base.lproj/Main.storyboard
dianfengshan
dianshan2
Merge pull request #6 from ChinaPicture/Cube

13231312dfgdfg