--amend
--amend
Merge branch 'development'
--amend
animations for judge and jury scale