dev2 branch mod
merge by discard dev2 commit content
Merge branch 'master' of https://github.com/smalllixin/Spoon-Knife