Make Cancel button in Extra Camera Settings window work.
Convert binary .dfm files to plain text.

For power_calibration and stimeditor_dragdrop, changes were made to
the GUI (stored in *.dfm files); these are usually text, but MAIN.dfm
and WAVGEN.dfm were binary (presumably because of bitmaps they contain).
I am converting to plain text to facilitate merging (from upgraded
origin/master into my own branches, and then eventually from those
branches back into master).
Merge branch 'master' into cancelbutton

Conflicts:
	WinFluor.dpr

Resolution:
        Needed to set correct version number.
Merge remote-tracking branch 'origin/master'

Conflicts:
	MAIN.dfm

Resolution:
        This is the text MAIN.dfm introduced in my
5e0103 push to master, not yet merged into origin/master.
Merge branch 'master' into cancelbutton
Merge pull request #1 from darrincedwards/cancelbutton

Make Cancel button in Extra Camera Settings window work.