API: catchphrases + time + counters always in the output (very badly done)
Merge branch 'master' of https://github.com/merlinND/OpenData

Conflicts:
	composer.json