added merge in edit user
come back username to admin panel
done
Merge pull request #126 from geekhub-php/merge-contribut-in-user-profile

done merge-contribut-in-user-profile
Merge branch 'develop' into merge-in-edit-user
Merge pull request #124 from geekhub-php/merge-in-edit-user

merge in edit user
Merge branch 'develop' into slicing

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