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

Conflicts:
	app/controllers/ControllerBase.php
	public/index.php
Profiler integrated
layout
layout partials
Commit before merge
remove idea
Merged template
Merge branch 'Stanislav' into vavas

Conflicts:
	app/controllers/ControllerBase.php
Models reload
Navbar added
categories tops
Merge remote-tracking branch 'origin/Stanislav' into vavas
Navigate modified
before merge
navigation
Merge remote-tracking branch 'origin/Stanislav' into vavas

Conflicts:
	app/controllers/ControllerBase.php
navigation