Merge branch 'ubervo3' into ubervo3-mobileport

Conflicts:
	game/engines/default/engine/init.lua
	src/core_lua.c
	src/main.c
	src/map.cpp
	src/noise.c
	src/particles.cpp
	src/renderer-moderngl/DisplayObject.cpp