PIM-3185 #comment CHANGELOG update
Merge pull request #65 from akeneo/PIM-3185

Remove the fixed value of the mysql unix socket
Standard dev-master uses CE bundles dev-master
Remove deprecated folders in readme.md
Composer stability stable
Use stable dep on CE-dev
Add note on CHANGELOG about stability
Merge pull request #69 from akeneo/stability_stable

Stability stable
Move base template into Enrich in order to get rid of the configuration standards edition
Enable comment bundle
Merge pull request #70 from akeneo/fix/base-template

Move base template into Enrich  ...
Merge pull request #71 from akeneo/feature/comment

Enable comment bundle
Merge branch 'master' into merge-fix-1.2

Conflicts:
	CHANGELOG.md
	composer.json
	composer.lock