articles can now be locked
Merge branch 'master' into lockArticles