Add -git to version number
[weather]Fixed Can't find location bug with known locations.
[web]Fixed NameError.
Merge remote-tracking branch 'upstream/master'