add android icon
碰撞bug修复
Merge branch 'master' of https://github.com/franklen/boxgohome