fix animation and thread Conflict
Merge branch 'develop' of https://github.com/bither/bither-android into develop