fixes #113 and #112 (margin + font slider options)
Merge remote-tracking branch 'origin/develop' into feature/textWidthMargins

Conflicts:
	lib/Readium.js