added gitattributes for git merge
Merge branch 'master' into production
removed merge.sh
Merge branch 'master' into production
add DE
Merge branch 'master' into production
translate main frame
autoselect default language
Merge branch 'production'