fix some conflicts introduced by share-modal
Merge branch 'master' of github.com:nprapps/books14