Major update in code organization
Major update in gameserver layout, part 2
Major update in gameserver layout, part 3
Added missing callbacks
Merge branch 'master' into add-find-battle
fix conflicts