Switch to XML-based filetype lookup
Revert manifest back to ICS
Fix ICS compat issues
Merge branch 'fix-icscompat' into update-addfolder
Merge pull request #39 from BrandoCommando/update-addfolder

Add File/Folder menu option merge
Fix merge conflict on arrays