SN-37 Write junit test and bug fix
Merge branch 'master' of github.com:Troshchuk/SocialNetwork