Templating Settings
Merge branch 'master' of https://github.com/phpcodebooster/package

Conflicts:
	PCB/Services/ViewService.php