CS fix
Merge branch 'master' of git://github.com/Padam87/NetpositiveDiscriminatorMapBundle into Padam87-master

Conflicts:
	EventListener/DiscriminatorMapListener.php