Profiler integrated
Commit before merge
Merged template
Merge branch 'Stanislav' into vavas

Conflicts:
	app/controllers/ControllerBase.php
categories tops