editor u adminu, sredjivane sitnice
Merge branch 'master' of https://github.com/EvolutionWebStudio/zeleni

Conflicts:
	protected/models/Menu.php
	protected/views/site/view.php