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