Rearranged templates
Merge branch 'master' of http://github.com/neurotech/edumate-extensions