дополнение
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/classes/Controller/System/Template.php