Merge branch 'users' into stage
Merge branch 'conversations' into stage
Merge branch 'stage' into users
add bio to users
add users status (online/offline)
change sign in form and add column 'confirmed' to friendships
add pending and requested friends, not finished
show all friends requests
accept/delete requests, bug fixes
Merge branch 'users' into stage
test
Merge branch 'stage' into conversations