Replaced feeding_table javascript code with non-minified version
Fixed merging conflict