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
Added the single BSD style license to all the JS files.
call to isCurrentViewFixedLayout to chek for fixed layout view type
Corrected uncommented-out license
Merge branch 'release/0.14' into develop
Merge branch 'develop' into feature/zoom
Merge branch 'develop' into feature/rendition_selection

Conflicts:
	js/views/fixed_view.js