Fixed sidebar bug
Fix conflicts

Conflicts:
	view/v_header.php