update
Merge branch 'master' of https://github.com/iYottt/graduatenew

Conflicts:
	themes/thesis/_menu.php