Merged Graphical Input Files with Gameplay

Merged the latest Gaphical Input Branch Files with the latest Gameplay
code.