sync with sauer svn
libgeoip 1.6.3
add hwtemp display menu
fix improperly synced makefile
fix improperly synced makefile [sdl2]
Merge branch 'master' into sdl2

Conflicts:
	src/Makefile