* Dedi server.properties loader and mappings * Finalize resolution of merge conflicts & apply suggestions from copygirl