fixed bug
merge fixed bug
license dev
confict
Merge branch 'master' of github.com:zhjutao/git