Upgrade samples to v2.
Merge branch 'master' of github.com:PhilipDaniels/ConfigZilla