author test and file upload debug
merge conflicts