Conventions changes
Adding file picker
Merge branch 'master'
Using the newly added FilePickerService.
Added filters to FilePickerService.