Implemented import of files/folders #1261

Merged
merged 3 commits into from Mar 7, 2014