Android client
Merge pull request #6 from filipmaelbrancke/master

Android client