Load mode 9 B&H files correctly
Merge branch 'master' of github.com:openmicroscopy/Imperial-FLIMfit
Add version number, tweaks for tvb display
Make OMERO version switchable
Add file for tracking OMERO version
Merge branch 'master' of github.com:openmicroscopy/Imperial-FLIMfit
Tidying up move to R2013b
Changes to compile with R2013b on Windows, rolling back switchable OMERO
Merge branch 'master' of github.com:openmicroscopy/Imperial-FLIMfit

Conflicts:
	FLIMfitFrontEnd/compile.m
Platypus changes for upgrade t0 2013b
Bug fix in compile
Merge branch 'master' of github.com:openmicroscopy/Imperial-FLIMfit
Final (hopefully) changes to allow build on 2013b for the Mac.
Add a txt file to OMEROMatlab so the directory is tracked.
minor bug fix in ic_importer
Fix problem with ghostscript installing into wrong directory on windows
inching towards fixing PicoQuant file load (issue #70)
Update code to identify TCSPC files more robustly and add check to ensure background value is not set to a value above the minimum data value