Still working on fixing ds_store issues
Still working on ignoring ds_store files
Merge to fix ds_store issues
Working on button display for firefox
Merge remote-tracking branch 'origin/WorkingBranch'