Merge templating
model contact
Merge templating
handling
Merge dev-master
handling message
Merge templating
handling message
Merge dev-master
Merge remote-tracking branch 'origin/templating' into templating