Updated template classes
Merge pull request #3 from adaptlearning/develop

Updated template classes