Merge branch 'master' into WorkLizzard
fix rotation bug, fix VideoAugmentation
Merge branch 'WorkLizzard'