Android App
Merge branch 'master' of https://github.com/greenspray/Smart-Maka