refactor
Merge branch 'master' of https://github.com/Incoding/apiTest
add freemarker if,output test