backup
revert back to working code
Before merge with new UploadService
changing uploadservice to include both upload and download

Merge branch 'master' of https://github.com/BucketDevelopers/Flash-file-transfer

Conflicts:
	bin/FileTransfer.apk
	bin/classes.dex
	bin/classes/com/common/methods/XmlParser.class
	bin/classes/com/master/webserver/File_Download$1$1.class
	bin/classes/com/master/webserver/File_Download$1.class
	bin/classes/com/master/webserver/File_Download$MyHTTPD.class
	bin/classes/com/master/webserver/File_Download.class
	bin/dexedLibs/actionbarsherlock-6211d9daa560eb4f7cc961a0216832b4.jar
	bin/dexedLibs/afilechooser-28c3a2a6ef30dfd59ef30f6be8b70cf8.jar
	bin/dexedLibs/android-support-v4-b4caf90cc1b576c3225791d47df340c5.jar
	bin/resources.ap_
	src/com/master/webserver/File_Download.java
Upload and Download Integrated
Upload and Download Integrated