New file/folder pushed into one menu item
Merge branch 'dev-alpha' of github.com:BrandoCommando/Backbone into dev-alpha
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
Dashclock extension
Dashclock settings

Configure icon, free/used status, and which drives
Bookmark/Storage fixes

Fixes #40 - Cyanogenmod persistent USB bookmark
Merge branch 'bugfix-cyanogenusb' into feature-dashclock
Use StorageHelper mount validator
Initial stage of implementing an fso properties drawer
Utilizes drawer layout and currently shoehorns the layout from FsoPropertiesDialog into the drawer container.
Initial stage, part 2, of implementing an fso properties drawer
Utilizes drawer layout and currently shoehorns the layout from FsoPropertiesDialog into the drawer container.
Merge branch 'dev-info-slideout' into dev-info-slideoutog
Fix merge conflict on arrays
Merge pull request #43 from bkensey/dev-info-slideout

File Properties Drawer
Merge pull request #41 from BrandoCommando/bugfix-cyanogenusb

Bookmark/Storage fixes
Merge branch 'feature-dashclock' of github.com:BrandoCommando/Backbone into feature-dashclock
Merge branch 'dev-alpha' of github.com:Toolify/Backbone into feature-dashclock