New scripts add
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'

Conflicts:
	application/libraries/template.php
Prepare Category.tpl
Merge remote-tracking branch 'origin/template'
Product documentation
merg