v1.2 update
Merge branch '1.2' of https://github.com/jiniannet/jntemplate into 1.2