updates from ftp
Merge branch 'master' of https://github.com/GreetersPL/frontend