первый
все
Merge branch 'master' of https://github.com/1oleg1/allsg

Conflicts:
	css/960.css
	css/ie.css
	css/main.css
	css/print.css
	css/reset.css
	css/screen.css
	css/text.css
	nbproject/private/private.xml
	protected/components/TypesMenu.php
	protected/components/views/typesMenu.php
	protected/config/main.php
	protected/views/layouts/main.php