Corrected a small typo in Plugins description
Merge pull request #483 from dharmeshkakadia/patch-1

Corrected a small typo in Plugins description
Fix bottom border on nested ul
Update highlight.js@8.3.0
Use book.json to store variables
Add 'variables' to book.json doc
Merge pull request #485 from citizenmatt/Nested_list_spacing

Fix bottom border on nested ul
Add plugin infinitescroll
Fix #487: Use generated toc as base for ebook generation
Normalize template paths
Improve toc in ebook (Fixes #338, #322)
Update documentation in readme
Bump version to 1.2.0
Merge branch 'master' of github.com:GitbookIO/gitbook

Conflicts:
	theme/assets/print.css
	theme/assets/style.css