Fix editor on forum
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/apps/forum/views/_blocks/header.php