Fixed build errors
Merge branch 'master' of https://github.com/iraklivasha/SAuto.git