homepage
homepage
merging
Merge branch 'slicing_1' of https://github.com/irene50288/ck-portal into irene50288-slicing_1

Conflicts:
	app/Resources/public/css/main.css
Merge branch 'irene50288-slicing_1' into develop
Replace all images to AssetsBundle
Configure assetic
Add dream index image filter