upload before final test
Merge branch 'master' into HEAD

Conflicts:
	.classpath
	.project