-changes from master branch
Merge branch 'russian-Overshare' of https://github.com/Sashke/overshare-kit into russian-Overshare