My last changes :P
Merge branch 'master' of https://github.com/Tonven/tabletteam.git
Final push :P