Login, Register, Add friend, Map communication with server
Merge branch 'master' of https://github.com/PDSD-2014/georgescu-manea-bican

Conflicts:
	bin/R.txt
	bin/RendezView.apk
	bin/classes.dex
	bin/classes/com/example/rendezview/AddFriendFragment$3.class
	bin/classes/com/example/rendezview/AddFriendFragment$4.class
	bin/classes/com/example/rendezview/AddFriendFragment$5.class
	bin/classes/com/example/rendezview/AddFriendFragment.class
	bin/classes/com/example/rendezview/GoogleMapFragment.class
	bin/classes/com/example/rendezview/LocateFriendFragment.class
	bin/classes/com/example/rendezview/LocateFriendListAdapter.class
	bin/classes/com/example/rendezview/LoginActivity.class
	bin/classes/com/example/rendezview/R$id.class
	bin/classes/com/example/rendezview/R$integer.class
	bin/classes/com/example/rendezview/R$layout.class
	bin/classes/com/example/rendezview/R$menu.class
	bin/classes/com/example/rendezview/R$string.class
	bin/classes/com/example/rendezview/R$style.class
	bin/classes/com/example/rendezview/R$styleable.class
	bin/classes/com/example/rendezview/RegisterActivity.class
	bin/classes/com/example/rendezview/UserInfo.class
	bin/resources.ap_
	gen/com/example/rendezview/R.java
	res/layout/set_meeting_layout.xml
	src/com/example/rendezview/AddFriendFragment.java
	src/com/example/rendezview/UserInfo.java