@Brief: some changes
Merge branch 'master' of https://github.com/mpcijevan/p2pChat

Conflicts:
	p2pchat/bin/classes.dex
	p2pchat/bin/classes/com/mpci/p2pchat/HomeActivity.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$string.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$style.class
	p2pchat/bin/p2pchat.apk
	p2pchat/bin/resources.ap_
	p2pchat/gen/com/mpci/p2pchat/R.java
	p2pchat/res/layout/activity_friends.xml
	p2pchat/res/menu/chat_room.xml
	p2pchat/res/values/strings.xml
	p2pchat/src/com/mpci/p2pchat/FriendsActivity.java
	p2pchat/src/com/mpci/p2pchat/HomeActivity.java
Merge branch 'master' of https://github.com/mpcijevan/p2pChat

Conflicts:
	p2pchat/bin/classes.dex
	p2pchat/bin/classes/com/mpci/p2pchat/HomeActivity$1.class
	p2pchat/bin/classes/com/mpci/p2pchat/HomeActivity.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$id.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$layout.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$menu.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$string.class
	p2pchat/bin/classes/com/mpci/p2pchat/R$style.class
	p2pchat/bin/p2pchat.apk
	p2pchat/bin/resources.ap_
	p2pchat/src/com/mpci/p2pchat/HomeActivity.java