iphone vers fix
Merge branch 'dev'