Merge branch 'tc'
fix bug of abilify
Merge branch 'master' into tc