Merge branch 'master' of https://github.com/greenzhang/Iemail1

Conflicts:
	.idea/workspace.xml
test
ignore