missing translation
Merge branch 'master' of ssh://mittenin.at/var/git/mercator
conversation feedback page
user show page
order layout
shipping company editable
layout offer
remove useless selfs