typos
Update composer.json
changed symfony2 dependency to 2.1.x
Merge branch 'master' of https://github.com/Padam87/NetpositiveDiscriminatorMapBundle into Padam87-master

Conflicts:
	EventListener/DiscriminatorMapListener.php
private property name typo fixed
Merge branch 'master' of git://github.com/Padam87/NetpositiveDiscriminatorMapBundle into Padam87-master

Conflicts:
	EventListener/DiscriminatorMapListener.php
Merge pull request #1 from Netpositive/master

merge