less warnings
Clean up nodedef.cpp
Fix misc. style issues
update games/default
Fix broken plantlike drawtype.
remove Settings from main.h
less shit in main.h
empty main.h
Bugfix: dont highlight (0,0,0) when theres no node pointed.
fix build
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/game.cpp
	src/nodedef.cpp
Merge remote-tracking branch 'origin/master'
Fix merge
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/guiFormSpecMenu.cpp
	src/nodedef.cpp