Stevebranch

Merged stevebranch with mainbranch added the filechooser