Merge branch 'developer'
Merge branch 'developer'
Merge branch 'developer'
Enabled localization of "Select File" button
Styled select File button
Merge branch 'master' into developer
catchup