Adding better handling of CardTemplates
Merge remote-tracking branch 'origin/development' into development