cici2

cici2
Merge branch 'master' of https://github.com/wincenter-develop/wincenter

Conflicts:
	wincenterDemo01/Base.lproj/Main.storyboard