Facebook integration beginnings
Merge branch 'master' of https://github.com/thomasteisberg/FamiliarFaces

Conflicts:
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/FamiliarFacesAndroid/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.projects/FamiliarFacesAndroid/.syncinfo.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Android/.metadata/.plugins/org.eclipse.core.resources/.snap