Added verification to friends management. Corrected errors
Merged branch master