rm upload; update jar/build
Merge branch 'master' of github.com:mingjun/homepage-data

Conflicts:
	build.xml