added block and accept requests for chatting, filtering just for friends
Merge branch 'KyleR'

"added block and accept for matches, filter just by friends"

Conflicts:
	Gemfile.lock
	app/assets/javascripts/app/controllers.js
	app/controllers/users_controller.rb
	app/views/users/show.html.erb
	db/schema.rb