Added Tinderbox template
Merge branch 'dev'
Merged from dev