与服务器同步
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/sohu/wls/app/automsg/MyActivity.java
	src/com/sohu/wls/app/automsg/taskconfig/TaskConfigManageService.java