Updated classes.
Merge branch 'master' of github.com:kd0kfo/uploader

Conflicts:
	java/src/com/davecoss/uploader/UploadOutputStream.java