EasyPR commit
Merge branch 'master' of github.com:liuruoze/EasyPR

Conflicts:
	.gitignore