commit from my Thinkpad computer
Merge branch 'master' of https://github.com/imGiantChan/shangxin into asus

Conflicts:
	.idea/workspace.xml