fixed server stuff and added a lot of stuff to game and player and map
merge conflicts