added friend object
Merge branch 'master' of https://github.com/garland106/graph_chat

Conflicts:
	src/com/graphchat/FriendsListActivity.java