Server OK
Merge branch 'develop' of https://github.com/twocoders/clickfight into develop