Edit-page for articles is added
Merge remote-tracking branch 'origin/master'