Started with the file Manager.
Resolve merge conflict
Fixes JSHint issues.
Add a filemanager.
Add file upload to the fileManager