Merge branch 'master' of https://github.com/cswope/iMacros

Conflicts:
Macros/SP11/create_course.js
Macros/SP11/template_setup.js