PIM-3227 : stabilize composer.json and prepare tag 1.2.7
Merge branch 'master' into merge-1.2-fixes

Conflicts:
	composer.json
	composer.lock
PIM-2237 : ignore composer.lock
PIM-2237 : update changelog
Merge pull request #76 from akeneo/merge-1.2-fixes

Merge 1.2 fixes