merge

diff --cc include/entities.h
Simple merge

diff --cc src/entities.cpp
Simple merge

diff --cc src/inventory.cpp
Simple merge

diff --cc src/ui.cpp
Simple merge

diff --cc src/world.cpp
Simple merge

diff --cc xml/playerSpawnHill1.xml
Simple merge