Navigate modified
Merge remote-tracking branch 'origin/Stanislav' into vavas

Conflicts:
	app/controllers/ControllerBase.php
navigation