fix bugs
Merge branch 'master' of https://github.com/pkwiecien/tumitfahrer-ios
fix conflict