Merge branch 'master' of gitlab.eman.cz:public-devboost/template-ios