убрал лишнее
Merge branch 'develop' of https://github.com/aed86/flowelia into develop