refactor main.cpp
Fix regression with USE_REDIS (refactor_main)
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/main.cpp
merge fix