add edit friends and add user who add me
Merge branch 'friendsEdit'
add methods in main activity and new changes in layout settings