Brought sample app and code templates up to date, refs #719
merge b6106660e9dce398a081217b1bfe059fa93ebc2c