farmat changes
Merge branch 'master' of https://github.com/vladpupaza/slide.app.modular.backbone