update
Merge branch 'master' of https://github.com/gazeing/WeatherDemo

Conflicts:
	src/com/example/weatherdemo/MainPage.java
should we copy this library out, to the project folder?