Merge branch 'master' of github.com:melnikk/social
Merge branch 'master' into develop