added attr('data-id') to retrieve data-id;
Merge branch 'remove-friend-option' into gh-pages