custom controls with OSD
add new controls to book view
Merge branch 'master' into canvas-controls/icons

Conflicts:
	build/mirador/mirador.js
Merge branch 'canvas-controls/icons'