Getting there.  Need to add a few more button handlers and get info on
how to get info from server.
Merge branch 'master' of https://github.com/dragonfred/Group9.git

Conflicts:
	res/layout/activity_friend.xml
	res/layout/activity_manage_friends.xml