Conflicts: dockerfiles/README.md
Removed trailing whitespaces with ```sh for file in `grep -r " $" * | cut -d : -f 1 | sort | uniq | grep -v " "`; do sed -i 's/[ \t]*$//' $file; done ``` and some handwork.
Conflicts: templates/status/500.tmpl