add fremarker
Merge branch 'master' into working
Merge branch 'study'


Signed-off-by: jimlgx <jimlgx@gmail.com>
add PropertyUtils
merged