Merge origin/master

Conflicts:
	view/nav.php
Merge origin/master
Merge origin/master