index.php
layout
Merge remote-tracking branch 'origin/master' into vavas

Conflicts:
	app/controllers/ControllerBase.php
	public/index.php
layout
layout partials
remove idea
Merge branch 'Stanislav' into vavas

Conflicts:
	app/controllers/ControllerBase.php
categories tops
Merge remote-tracking branch 'origin/Stanislav' into vavas
before merge
navigation
Merge remote-tracking branch 'origin/Stanislav' into vavas

Conflicts:
	app/controllers/ControllerBase.php
navigation
Commit before merge
Language switcher. Merge vavas. Top Navigation