Brought sample app and code templates up to date, refs #643
merge 26d2d459e00fc158f157b14ebce06874ee230046