Merge branch 'hotfix/zoom' into develop
Merge branch 'hotfix/pop_memory_issue' into develop
use 640x640 for horizontal scroller photos
Merge branch 'develop'