Add player:override_day_night_ratio() for arbitrarily controlling sunlight brightness
Merge commit '6a3fa9d' into merge2

Conflicts:
	src/clientserver.h