Fixes bug with template
Removed partial template call
Updated templates to new attributes
Merge pull request 'pull/#43' from 'issue/#42'

Conflicts:
	templates/gmcq.hbs