Fixed when first-run wizard appears
Merged fix for first-run wizard

Conflicts:
	src/weather-desktop.cpp
Added units prompt on first run and added Units class