travis-ci image branch fix
Merge pull request #746 from leonardo-proietti/1.2.x

travis-ci image fixed for branch 2.1.x
Updated Dutch translation
Merge pull request #907 from WouterJ/patch-1

Updated Dutch translation
Fixed parse error in JA translations
Swapped double quotes for singles in JA translation
Merge pull request #1064 from InvertedAcceleration/1.2.x

Fixed parse error in JA translations
consolidate doctrine listeners and move to Doctrine directory
adjust to feedback
Fix typo
remove unused 'use' statements
Added note about the UserProvider deprecation
Merge pull request #1136 from dbu/move-listeners

consolidate doctrine listeners and move to Doctrine directory
updated swiftmailer/swiftmailer version specification

Version 5.0.0 of SwiftMailer has been released, which is a non-breaking change - so modifying the require-dev specification to allow <6.0.
Merge pull request #1164 from shieldo/patch-1

updated swiftmailer/swiftmailer version specification
Merge pull request #1146 from felds/patch-1

Fix typo
Update FOSUserBundle.sk.yml

fix on resetting e-mail. subject and message were missing, there was only e-mail instead, and it didn't work
Merge pull request #1167 from Kuro-dake/patch-1

Update FOSUserBundle.sk.yml
Add badge-poser
Merge pull request #1169 from agiuliano/master

Add badge poser