Friends view deleted, find view elaborated
Prithvi: cosmetic changes
commit
Merge branch 'friends_view_ps'

Conflicts:
	bin/classes/com/example/cityquest/R$id.class
	gen/com/example/cityquest/R.java