Fix some bugs
Merge branch 'master' of https://github.com/guiguifelin/PolySoft

Conflicts:
	PolySoft.suo