Merge pull request #41 from cjmcgraw/Iss21

Iss21 branch: Issue #21 merger accepted.

This merger updates Master branch to reflect changes in phase one Issue #21.
Issue #21: Iss21 branch, Phase two - Step one implementation. Created dialog window to allow editing of OptionItem data.