remove unvanted plugisn from composer.json
Merge pull request #550 from m038/CS-4921-1

CS-4994: Adds switch to user profile
add user types filtering
Merge pull request #551 from ahilles107/master

add user types filtering
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)
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