add upload
Merge branch 'master' of git@github.com:list88zhu/ShanNianApp.git

Conflicts:
	ShanNianApp/project.properties
add http
增加后台任务。