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

Conflicts:
	.classpath
update