work on reciprocal friends
Merge branch 'master' into reciprocal_friends

Conflicts:
	app/helpers/application_helper.rb
set up models and callbacks
photo validation updates
friend requests work