added filechooser branch
Merge branch 'master' into beta