committed 29c3 version of Android client
Merge branch 'master' of github.com:sabl0r/locus