(bug) added back satokos work lost in last merge conflict
(merge) get userId from local storage
Merge pull request #118 from bace135/feat/friend-requests

(bug) added back satokos work lost in last merge conflict