Fix issue PHP Templating
Merge branch 'refs/heads/master' into PHP_Templating_2

Conflicts:
	index.php
Add logo back
Merge pull request #78 from jvanoel/PHP_Templating_2

Fix issue PHP Templating