add : friend_request
Merge branch 'Juneseok_branch'

Conflicts:
	app/controllers.py
	app/models.py
	app/templates/navbar.html