Some state changes and search functionality.
Merge branch 'master' of https://github.com/jcarroll2007/Faces

Conflicts:
	friend/friend.js