Merge dev-master
trans
Merge templating
model contact