Fix masterserver javascript: adjustable output id
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
New math mapgen
water in air underground tune
Merge remote-tracking branch 'upstream/master' into math2
Merge remote-tracking branch 'upstream/master' into math2
Merge remote-tracking branch 'upstream/master' into math2

Conflicts:
	src/map.cpp
Merge remote-tracking branch 'upstream/master' into math2
Merge remote-tracking branch 'upstream/master' into math2
Merge remote-tracking branch 'upstream/master' into math2

Conflicts:
	minetest.conf.example
	src/defaultsettings.cpp
based on v7
tuning math
remove json config
ready to merge
Merge remote-tracking branch 'upstream/master' into math2
Math mapgen fix, ip show on connect, pathfinder segfault fix
Merge remote-tracking branch 'upstream/master' into math2