merge
Merge branch 'flo' of https://github.com/Hralien/libgdx-kryonet-chat.git into flo