air condition
Merge branch 'master' of https://github.com/w821881341/HealthLife.git

Conflicts:
	ShareSDK/bin/sharesdk.jar

	修改:         HealthSLife/.classpath
	新文件:       HealthSLife/.settings/org.eclipse.core.resources.prefs
	修改:         HealthSLife/AndroidManifest.xml
	新文件:       HealthSLife/libs/android_api_1.1_forsdk.jar
	新文件:       HealthSLife/libs/galaxy_mini.jar
	修改:         HealthSLife/src/com/healthslife/activitys/GetLocationActivity.java
	修改:         HealthSLife/src/com/healthslife/run/RunClient.java
	修改:         HealthSLife/src/com/healthslife/run/dao/RunRecord.java
	修改:         HealthSLife/src/com/healthslife/run/fragments/DestinationRunFragment.java
	新文件:       LocationLib/.settings/org.eclipse.core.resources.prefs
	修改:         LocationLib/AndroidManifest.xml
	修改:         LocationLib/src/com/dm/location/DMLocation.java
	修改:         LocationLib/src/com/dm/location/DMLocationClient.java
	修改:         LocationLib/src/com/dm/location/DMLocationService.java
	修改:         README.md
	删除:         ShareSDK/bin/.gitignore
	删除:         ShareSDK/bin/AndroidManifest.xml
	删除:         ShareSDK/bin/R.txt
	删除:         ShareSDK/bin/jarlist.cache
	修改:         ShareSDK/bin/sharesdk.jar
	修改:         ShareSDK/project.properties