Adds Rodericks changes from feature/LTI_Templates up till commit 904aadd
Merge branch 'feature/new_interface_integration_part4' into develop