composer.lock
fixed empty poster in dream with status success in slider on homePage. Fixed sonata.config
search ready
small fix in edit dream template
Merge branch 'develop' of https://github.com/geekhub-php/CheDream2 into develop
composer.lock
Merge branch 'develop' into search

Conflicts:
	src/Geekhub/DreamBundle/Resources/config/routing.yml
fix merge conflict
Merge branch 'develop' of https://github.com/geekhub-php/CheDream2 into develop
Merge branch 'develop' into search
fix route
Merge pull request #74 from geekhub-php/search

Search