Update Html 14-2 #2260
Merge remote-tracking branch '810/html-crypsis-fix' into pr-810-feature-hmvc-merge2

Conflicts:
	components/com_kunena/site/template/crypsis/layouts/topic/edit/editor/default.php
Small fix to author link.
Merge pull request #2287 from coder4life/pr-810-feature-hmvc-merge2

Pr 810 feature hmvc merge2, fetch update remote tracking