aded test18 support.
Merge branch 'master' of https://github.com/cuizuoli/zhuyeqingtea.git