fix
Merge branch 'master' of https://github.com/fbsamples/android-friend-smash