License文件用UTF-8保存，默认的ANSI在GitHub上面会变成乱码
Merge branch 'master' of https://github.com/codefollower/Lealone

Conflicts:
	License.txt