Merge pull request #21 from TriggerAu/feature/editorinputlocking

Adding GUI Locking in Editor scenes - Feature/editorinputlocking
Merge remote-tracking branch 'upstream/master' into feature/editorinputlocking