Address issues related to refactoring the_game

Fix time of day persistence
Fix wield item being updated every frame causing small performance hit
Rename some classes and variables
Prepare for merge game.cpp
Prepare for merge 2
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/game.cpp