Edit articles
Add and delete articles
Register users
Merge remote-tracking branch 'upstream/master'