Fix compile errors.
Merge branch 'master' of github.com:stuntrally/stuntrally into editor