freemarker enhancement
Merge branch 'master' of ssh://git@github.com/zhwbqd/Java.git

Conflicts:
	freemarkMail/src/test/resources/templates/result.txt