Fixed breadcrumbs and wrong links
Fixed conflict

Conflicts:
	1semester.php
	1semesterMat.php
	2semester.php
	2semesterMat.php
	2trimester.php
	2trimesterMat.php
	matCourse.php
	personalData.php
	scienceComputerEng.php