merges wp-editor branch with current dev branch
Merge branch 'dev' of https://github.com/jazzsequence/Easy-WordPress-Custom-Post-Types into dev
merges wp-editor branch with current dev branch