Track are own weather
Merge remote-tracking branch 'origin/kitkat' into blood

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	default.xml