initial experimentation
Merge remote-tracking branch 'origin/develop' into feature/zoom
Added zoom to fixed layout
Merge
Changes to get zoom working alongside scrollable view
call to isCurrentViewFixedLayout to chek for fixed layout view type
Merge branch 'develop' into feature/zoom