update func test for friendship_controller
Merge branch 'master' of https://github.com/Eclipse932/SyncUp_backend

Conflicts:
	app/controllers/activities_controller.rb