Merge remote-tracking branch 'origin/WorkingBranch' into gh-pages

Conflicts:
	Project1Android/assets/www/.DS_Store
	Project1iOS/www/.DS_Store
	Project1iOS/www/css/.DS_Store
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' into gh-pages