update template boilerplate files
Merge remote-tracking branch 'upstream/master' into Development
CT's WIP codebase as on Oct 29, 2013