updated upload functionality
Merge branch 'dev'

Conflicts:
	src/foundationphp/UploadFile.php