first working version
Merge branch 'master' of https://github.com/PavolS/mates-web-client