this is change from 

Signed-off-by: vodinh <vodinh90@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	Freemarker_SpringMVC/src/com/freemarker/GitTest.java