Merge pull request #66 from mehere/dev

Pull Request from dev -> dev-wee on 2/3
Includes validation code in Template.php
Merge branch 'dev-wee' of https://github.com/mehere/RTSS.git into dev-wee
Merge pull request #67 from mehere/dev-wee

Includes validation code in Template.php