clean up
Merge branch 'master' of github.com:macklinu/community-android