Merge https://github.com/wong2/xiaohuangji

Conflicts:
	controller.py
Merge remote-tracking branch 'origin'