updates
Merge https://github.com/greenbeats/Android
android