minor changes to back-to-center animation
FUck it, back to straight lines
Merge branch 'develop' into feature/Lars
Merge branch 'feature/Lars' into develop