update cmsadmin from cms-demo
Merge branch 'master2' into newtinymce