Add composer.json
test
test 2
Revert "test 2"

This reverts commit accaef23a679e82b8c71bc90c4b4ee409b373bec.
Revert "test"

This reverts commit 01e27021a747747f165a997067d224028297a9cf.
Fallback to default image if no image for relation attribute
Generate images attribute even when there is no relation available
Merge branch 'master' into github_master

Conflicts:
	composer.json