Disabled the effect on header + styles clean up
Resolved conflicts

Conflicts:
	templates/includes/layout/header.jade