Merge pull request #482 from proller/liquid

finite liquid

diff --cc src/content_abm.cpp
Simple merge

diff --cc src/content_mapblock.cpp
Simple merge

diff --cc src/defaultsettings.cpp
Simple merge

diff --cc src/map.cpp
Simple merge

diff --cc src/map.h
Simple merge

diff --cc src/mapnode.h
Simple merge

diff --cc src/server.cpp
Simple merge

diff --cc src/server.h
Simple merge