finished filepicker
meged with master
Merge pull request #30 from christiansakai/filepicker_finishing

Filepicker finishing