change private protperties to protected, this is needed to serialize objects with those entities
cache pagination object
remove empty line
remove broken subdir support - it breaks caching (links)
CS-5108: Undefined method getClient() in DmproService
update ClientFactory
Merge pull request #552 from ahilles107/private_protected

Change private properties to protected (in entities)
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
Fixes error in slideshow for mobile devices
Renames comments_locked to commentsLocked, because api uses commentsLocked
Merge pull request #556 from m038/CS-4921-1

Cs 4921 1
Merge pull request #554 from thnkloud9/master

CS-5108: Undefined method getClient() in DmproService
[CS-5047] - Commenter profile link has no stripped html tags
fixes in slideshows