- tryout fix animations iOS
Merge origin/master
- tryout fix animations iOS
- possible fix for step 2 select box