button (glyphicon) for metadata modal
Merge branch 'upstream_develop' into feature/metadata_modal_in_reader
Merge branch 'feature/metadata_modal_in_reader' into dzb

Conflicts:
	lib/EpubReader.js
	templates/reader-navbar.html