Fixture V1
Merge branch 'master' of https://github.com/Harpaga/harpagaproject.git

Conflicts:
	src/Harpaga/MerchantBundle/Form/Handler/EditCommercant.php