composer support, remove event mapper because it is unnecessary
Merge remote-tracking branch 'origin/master'