First commit
Merge https://github.com/MrArtic/android