update sample
Merge branch 'master' of https://github.com/tomoon/sdk

Conflicts:
	Weather/bin/AndroidManifest.xml
	Weather/bin/classes/com/tomoon/weather/R$drawable.class
	Weather/bin/classes/com/tomoon/weather/R$id.class
	Weather/bin/classes/com/tomoon/weather/R$layout.class
	Weather/bin/classes/com/tomoon/weather/R$menu.class
	Weather/bin/classes/com/tomoon/weather/R$string.class
	Weather/bin/classes/com/tomoon/weather/R$style.class
	Weather/bin/classes/com/tomoon/weather/WeatherActivity$1.class
	Weather/bin/classes/com/tomoon/weather/WeatherActivity.class
	Weather/gen/com/tomoon/weather/R.java