Fix style and phpdoc
Clean up specs
Quote '@' characters in yaml
Merge pull request #1437 from akeneo/cleanup

Style and phpdoc fixes
Update CHANGELOG.md
Merge branch 'master' into fix/PIM-3121

Conflicts:
	CHANGELOG.md