tiny revision
Merge branch 'master' of github.com:lunzhy/PyShanbay

Conflicts:
	pyshanbay/main_widget.py