ticket5: refactored by adding TSKFriend class
ticket5:done
Last updates
Added changes from ticket5