s
Merge branch 'master' of https://github.com/pencilkill/g-yiii4

Conflicts:
	protected/extensions/pdfable/WkHtmlToPdf.php
	protected/helpers/HCOutput.php