куча всякой мелочи
Merge branch 'dev' of https://github.com/ndra/infuso2 into dev