Merge branch 'master' of https://github.com/andrenovax/dopomoga_project into deploy_getbarista
Merge branch 'deploy_getbarista' of https://github.com/andrenovax/dopomoga_project into deploy_getbarista