Merged changes im gamemodel from client
Minor cleanup
Bugfix for missing Map file
Merge branch 'gamemodel' into server