Added trigger templates and cleaned unused assets
Merge remote-tracking branch 'upstream/master'