+
Merge remote-tracking branch 'origin/4324'

Conflicts:
	application/views/template.php
++