Add cobrand Fils
 add templates
Merge remote-tracking branch 'upstream/master' into siyenza