implement upLoadFile;bugs fix;
Merge branch 'master' of https://github.com/Appad/APServer

Conflicts:
	.gitignore