changed login
Merge branch 'master' of https://github.com/jsorrell/android_game
added friend activity
Merge branch 'master' of https://github.com/jsorrell/android_game