Merge branch 'develop' of https://github.com/geekhub-php/CheDream2 into develop
fixed merge image
Merge branch 'develop' of https://github.com/geekhub-php/CheDream2 into develop
refactored success merge
Merge branch 'develop' of https://github.com/geekhub-php/CheDream2 into develop
fix russian picturename
fixes
Merge pull request #112 from geekhub-php/user-fixes2

fixes from old mergeaccounts branch
fixed default tests
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into slicing

Conflicts:
	src/Geekhub/UserBundle/Resources/views/User/view.html.twig