now we get user ID from URL not from session
Merge remote-tracking branch 'origin/master'