add docker support for development and revert layout changes for now

Merged Roberto José TORO OLMEDO requested to merge github/fork/satra/enh/layout into master

Created by: satra

Merge request reports