Fixed typo for OpenROV/openrov-image/issues/69
fixed issue#295
Removed commented out code
Merge pull request #298 from OpenROV/bug/295

InputController now handles re-registering other controllers after a deactivation of another control
Fixed misspelling
Fixed typo
Merge pull request #302 from OpenROV/master

Resync master changes into RC1