add up command to fish
add xptemplate
Merge branch 'master' into feature/fish