commit without internet
Merge branch 'dev' of https://github.com/sun40/intern into dev

Conflicts:
	AdvancedWeatherWidget/project.properties
	AdvancedWeatherWidget/src/com/dbbest/widget/map/MapActivity.java
	AdvancedWeatherWidget/src/com/dbbest/widget/map/NearCityAsync.java
bugsense