deleted json_pretty_print in twig file
Merge branch 'chartinger' into gsitter
Merge remote-tracking branch 'origin/gsitter' into chartinger
some changes
fixed extractedcatrobatfile and added spec for extractedcatrobatfilespec
added projectmanagerspec
added knp paginator to project manager
Merge remote-tracking branch 'origin/gsitter' into chartinger

Conflicts:
	composer.lock