Update wiki2
Update CMS test
Merge branch 'master' of github.com:cockatoo-org/CockatooSamples