Adds Rodericks changes from feature/LTI_Templates up till commit 904aadd

This adds Roderick's changes to feature/LTI_Templates up till commit 904aadd 

Note: will merge pull request manually into 'develop' without review.