removing file from version control
update file upload_to callback functions
merging from master