Added file upload functionality for import option.
Merge branch 'dev'