Merge remote-tracking branch 'origin/develop' into develop
lauch animation
Merge branch 'feature/moveSwift' into develop
fixed conflict