Merge pull request #235 from Alex-Diez/BETA_0_0

Different fixes
develop new design for translation orders