modify abilify
modify tests
Merge branch master into gh-pages