Fixes bug with inconsistent variables for comments_locked
Merge remote-tracking branch 'upstream/master' into CS-4921-1

Conflicts:
	newscoop/library/Newscoop/Entity/Article.php
Merge pull request #555 from m038/CS-4921-1

Cs 4921 1
Merge branch 'master' of github.com:sourcefabric/Newscoop into slideshows
rename private to protected