update from tanglei
edit upload
Merge remote-tracking branch 'remotes/origin/new_stuff'

Conflicts:
	htdocs/iphone6.htm
remove binary files
Edit upload url
Edit upload url
Merge remote-tracking branch 'origin/new_stuff'

Conflicts:
	htdocs/iphone6.htm
add upload