Merge branch 'master' into gh-pages

Conflicts:
	en.pdf
	ko.pdf