Replace edited files with original versions

replaced files that I accidentally edited with original versions from
the develop branch