11-27
Merge branch '11-21' of github.com:waqei/qiqiqi into 11-21

Conflicts:
	.idea/workspace.xml