Critical bug fixed. Refactoring create friendship
Merge branch 'master' into dev