First Commit
Merge remote-tracking branch 'master/master'
Kind of working android client