Merge branch 'master' into AboutDialog
Merge branch 'master' into PreferenceDialog
Merge branch 'master' into Translation
Merge branch 'master' into XMLmaterialIO
Merge branch 'master' into XMLmaterialIO
Merge branch 'master' into PreferenceDialog
Merge branch 'master' into AboutDialog
Merge branch 'master' into Translation
Merge branch 'master' into HTMLexport
Merge branch 'master' into XMLmaterialIO
added icon for language preferance pane
new layout
update of translation files
Merge branch 'AboutDialog'
Merge branch 'PreferenceDialog'
Merge branch 'Translation'
Merge branch 'XMLmaterialIO'
Merge branch 'HTMLexport'