zoom & switch images
Merge branch 'development'
merged dev