fix ss
Merge branch 'master' of https://github.com/alexwasik/new_app