SN-28 Refactor
Merge branch 'master' of github.com:Troshchuk/SocialNetwork