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
Merge pull request #1433 from akeneo/fix/PIM-3121

Fixes memory leak on generic Doctrine Writer
Merge branch '1.2'
Add missing queries in upgrade doc
Merge branch '1.2'

Conflicts:
	src/Pim/Bundle/BaseConnectorBundle/Writer/DirectToDB/MongoDB/ProductWriter.php
Fix scopable file input display on firefox
Merge pull request #1498 from akeneo/fix-1497

Fix scopable file input display on firefox
[CrowdIn] Updated translations
Merge pull request #1500 from nono-akeneo/crowdin/2014-09-08-10-49

Update translations from CrowdIn
Merge pull request #1503 from akeneo/1.2

1.2
PIM-3185 #comment remove the fixed mysql socket location
PIM-3185 #comment CHANGELOG update
Merge pull request #1504 from akeneo/PIM-3185

Pim 3185
Complete UPGRADE.md with the default user group All
Merge pull request #1505 from akeneo/fix/upgrade

Complete UPGRADE.md with the default user group All