initial zoomify implementation, in progress
initial zoomify implementation, in progress
update zoomify url placeholder
Merge branch 'zoomify' of github.com:NUKnightLab/StoryMapJS into zoomify

Conflicts:
	website/templates/_modals.html
fix google+leaflet double click handling
Add warning message for max image size option editing
Merge branch 'master' of github.com:NUKnightLab/StoryMapJS into zoomify
Merge branch 'editorfonts' into zoomify

Conflicts:
	website/templates/edit.html
Add show_lines option
Adjust overview markers and polyline on slide deletion
Merge branch 'editorfonts' into zoomify
Restore search box; fix default location when adding slide; fix default view if no slides
Merge branch 'zoomify' of github.com:NUKnightLab/StoryMapJS into zoomify
Restore polyline creation on slide_select
Add prd/stg deployment keys (requires newer fablib)
Add default data object
Add additional block to load scripts before storymap; use website-local embed page
Ensure zoomigy path ends with slash; add zommify url help text
Fix google cusotm map type
Handle zoomify path/width/height changes