Merge branch 'master' of /Users/matthewfrederick/IdeaProjects/conf-registration-api with conflicts.
move custom confirmation email from conference to registrant type
remove unused queries class
use custom confirmation text in email if available
Spacing
Spacing
Add Brackets
correct errors
spacing v.2
Merge pull request #286 from CruGlobal/EVENT-115

Add custom confirmation email text to registrant types