Merge branch 'LewisBranch' into TimBranch

Conflicts:
Assets/sprites.unity.meta
Facial animation