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
Merge pull request #1184 from hugohenrique/master

Updated to new definition validation minLength, maxLength => Length
Changed use of prependClientTransformer to addViewTransformer.

Because of: https://github.com/bschussek/symfony/commit/bec80157f9ff8bcadbdad85375bc9ea6fbafb6f8
Update typo

Update wrong comment
Merge pull request #1195 from ardianys/patch-1

Update typo
The format is required by FrameworkBundle

Is the format is missing 

InvalidArgumentException: Template name "MktUserBundle:Registration:email.twig" is not valid (format is "bundle:section:template.format.engine")
Merge pull request #1207 from armetiz/patch-1

The format is required by FrameworkBundle
Merge local variables with globals

With this PR, globals defined variables aren't available on email twig templates.
group mergeGlobal inside sendMessage function
Merge pull request #1209 from armetiz/patch-1

Merge local variables with globals
Merge pull request #1191 from thvd/patch-1

Changed use of prependClientTransformer to addViewTransformer.
Fixed a link inside docs

Fixed a link inside docs
Merge pull request #1224 from DiliBau/patch-1

Fixed a link inside docs
fixed UserProvider::refreshUser() not checking the class-name