Editor setup
Merge branch 'master' into chrisDev
Revert 0045474..8c61b96

This rolls back to commit 0045474fe0a0a34f6ecba629fba39ac71755295a.
Revert d09a3ed..a26a54a

This rolls back to commit d09a3ed023f5cdb90b139ee779ea07e1c3a56d31.
Revert 0f61ce2..416d19b

This rolls back to commit 0f61ce2041b9389773828243ba776b39d5e28108.
Revert 8c61b96..9b56526

This rolls back to commit 8c61b9646d05211e2fabb8394df209453c81f305.
Pattern tool, player animation, grid script

+ started player hair
Merge branch 'chrisDev'
Merge branch 'master' into jump_controls