Added friends search
Merge branch 'development' into Forget_password