add friends page
Merge branch 'master' of https://github.com/belmen/CareCoordinator.git

Conflicts:
	res/values/strings.xml