new flow per  discussion with Jonah. Added perpetual link to collection and other two buttons work!
Merge branch 'master' of git.ccnmtl.columbia.edu:sherdjs into develop

Conflicts:
	src/bookmarklets/sherd.js
* Updating version number
* Pulling "jump on first asset" logic.
Merge branch 'master' of git.ccnmtl.columbia.edu:sherdjs into develop
1.4 for develop
Merge branch 'master' of git.ccnmtl.columbia.edu:sherdjs into develop

Conflicts:
	build.sh
2.1 for develop
Merge branch 'master' of git.ccnmtl.columbia.edu:sherdjs into develop

Conflicts:
	build.sh
(hopefully) resolving the mysteriously disabled ARTStor toolbar.
more UI changes to new sherd flow
took out spans and restyled the overlay
ui edits
working closer to a nice lookin flow!
style changes to sherd layout
small css changes
Merge branch 'master' of git.ccnmtl.columbia.edu:sherdjs into develop

Conflicts:
	build.sh
Updating sherdjs after master merge.
Rethinking new ARTstor implementation. Changing out to save a new primary source type for an ARTstor asset. This approach allows the main MeTh application to match a bookmark'd asset with an existing asset in a course.
Updating build number.
change to hover handler