調整stores
Merge branch 'master2' into newtinymce