merged the content type extension and delta

src/content_craft.cpp

src/content_inventory.cpp

src/content_mapblock.cpp

src/content_mapnode.cpp

src/content_mapnode.h

src/content_object.h

src/content_sao.cpp

src/content_sao.h

src/defaultsettings.cpp

src/environment.cpp

src/farmesh.cpp

src/farmesh.h

src/game.cpp

src/gettext.h

src/guiKeyChangeMenu.cpp

src/guiKeyChangeMenu.h

src/guiMainMenu.cpp

src/guiMainMenu.h

src/guiMessageMenu.cpp

src/guiPasswordChange.cpp