edit article new editor position
Merge branch '13112001'