Merge branch 'master' of https://github.com/PHPBeat/Redstart-Templating.git