.
Merge branch 'master' of github.com:dafonso/PSI-PL001

Conflicts:
	inc/common/nav.php
Merge branch 'master' of github.com:dafonso/PSI-PL001
last edits