140617 doing FriendsList
140617 doing FriendsList
Merge branch 'master' of https://github.com/naddola/Give2gether into naddola-master

Conflicts:
	joonmin/Give2gether/bin/Give2gether.apk
	joonmin/Give2gether/bin/resources.ap_
	woosik/Giv2gether/bin/Giv2Gether.apk
	woosik/Giv2gether/bin/resources.ap_
Merge branch 'naddola-master'