Add Freetype support
better flow on stairs
Merge branch 'master' into liquid
Merge branch 'liquid' into pressure

Conflicts:
	src/map.cpp
Merge branch 'pressure' of https://github.com/proller/minetest into pressure

Conflicts:
	src/map.cpp