some view changes
Merge branch 'feature-view1'

Conflicts:
	src/Application/Project/MainBundle/Entity/Slider.php