added friend list
Merge branch 'master' of https://github.com/jsorrell/android_game