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
View success dreams at homepage sorted by createdAt
Sort dreams at homepage by favoriteCout
fixed merge contributes
Merge branch 'develop' into fix-merge-contribution
fixed merge contributes start test
created mock
worked testMergeContributions and applied cs-fixer to UserBundleTests
worked testMergeDreams
testing new node
Revert "testing new node"

This reverts commit 2252bbd149d320361baf1d16a415a2fc87938dde.
travis correct
Revert "travis correct"

This reverts commit 72d1b61bff065938b7cdeaa94869c5a27e364c5c.
fix node
corrected test to protected method