Added ClearFw to composer
Merge branch 'master' of https://github.com/oat-sa/generis

Conflicts:
	composer.json