ticket:5 Dumb commit 0
ticket:5 Added small fixes
Merge branch #2 't5_friends_priority'