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

Conflicts:
	libs/framework.jar
	src/com/example/weatherdemo/MainPage.java
remove
update