1st bckp
Merge branch 'master' of github.com:zldrq/ContentEditor