Android client update
Merge branch 'master' of github.com:bopang/FaceMe