CU-104 Send a friend Request
Merge remote-tracking branch 'origin/develop' into develop