Merge pull request #1 from usunyu/dev

Clean Project
android stable
android stable
Merge pull request #2 from usunyu/taohu

Taohu
Merge branch 'dev'