updated some stuff
Merge branch 'boliches' of https://github.com/Pomeeelo/tell-client into boliches