add more metadata overrides to canvas metadta api
Merge pull request #54 from raffazizzi/master

Loading indentation info from manifest into 1st datastore
changes for HTML-based image viewer
remove built files
Merge pull request #55 from raffazizzi/master

Slightly better search results display strategy
convert parseInt to Math.floor; better image resize/pan
Merge branch 'master' of https://github.com/umd-mith/sga into umd-mith-master

Conflicts:
	drupal/themes/sga-theme/js/sc/shared-canvas.js
	shared-canvas/demo/js/shared-canvas.js
	shared-canvas/dist/shared-canvas.coffee
	shared-canvas/dist/shared-canvas.js
	shared-canvas/dist/shared-canvas.min.js
comment out dependence on svg-related libraries
renable marquee; hook up image zoom control to image control component
Merge pull request #53 from jgsmith/master

add more metadata overrides to canvas metadta api
Merge remote-tracking branch 'upstream/master'
latest by Kirsten
added search messages styling
added placeholder for user messages
fixed url to search service
catching errors and no results
compiled
citation url reflects hashchanges
populating metadata
new fields