Merge pull request #19 from ChinaPicture/Cube

12
13414
Merge pull request #20 from ChinaPicture/Cube

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

Conflicts:
	YouBaoOC/Base.lproj/Main.storyboard
hhsgsf
4214124