sori_ja_vse_vupravuv
missing_iPad_interface
resolve merge conflict