Put the language bar in the demand.show page.
Basic support for editable field.
Basic support for Conflict modification.
Merge branch '0.1-Translation' into 0.1