cfat -> vfat
Merge pull request #5 from jsturdy/develop

added handling of timeout errors to GEMHwDevice
attempting to merge jsturdy onto cms-gem-daq-project
Merge pull request #2 from cms-gem-daq-project/develop

Testbeam updates
committing changes to jsturdy for convenience
Merge branch 'develop' of github.com:jsturdy/gem-daq-code into develop
fixed some javascript
Merge branch 'develop' of https://github.com/jsturdy/gem-daq-code into develop

Conflicts:
	gemdaq-testing/gemhardware/xml/vfatmanager.xml
	gemdaq-testing/gemsupervisor/html/scripts/tbutils/changeImage.js
data format have been updated
data format have been updated