add span in term & conditin
Merge branch 'master' of https://github.com/sixxis69/833studio