Fix bugs

Conflicts:
	src/Dof/MainBundle/Resources/public/css/newmain.less