change the tmp directory of struts2 uploading
Merge remote-tracking branch 'origin/master'