Merge remote-tracking branch 'parent/testserver'
Merge remote-tracking branch 'parent/testserver'
clean up map loading
Merge remote-tracking branch 'parent/testserver'

Conflicts:
	World.cpp
clean up db files
remove useless pointers from load

run make style
astyle
Fix getPlayerLanguage in Lua binding
Add override identifier