merge
delete
Merge branch 'master' of https://github.com/ilife5/sT

Conflicts:
	UI/Affix/affix_demo.html
	UI/affix_demo.html
	UI/affix_expressions_demo.html