Merge pull request #22 from GorillaApp/undo-redo

Various Improvements to GorillaEditor
Merge remote-tracking branch 'origin/master' into undo-redo