loader
гит
Merge branch 'master' into tags_new

Conflicts:
	.gitignore
изменение логики в проектах
gitignore
права
права
merge project, tag, master
Merge pull request #10 from org-espe/project

Projects
окно проектов
Merge branch 'project' of https://github.com/org-espe/org_new into project
окно проектов
Merge branch 'master' into project

Conflicts:
	frontend/modules/projects/js/controllers/list.js
	frontend/modules/projects/partials/list.html
	protected/config/main.php
	protected/controllers/UsersController.php
	protected/messages/ru/inbox.php
	protected/models/ProjectObject.php
	protected/modules/rights/components/RController.php
	protected/modules/rights/components/RDbAuthManager.php
	protected/modules/rights/components/RGenerator.php
	protected/modules/rights/components/RInstaller.php
	protected/modules/rights/components/Rights.php
	protected/modules/rights/components/behaviors/RAuthItemBehavior.php
	protected/modules/rights/license.txt
	protected/modules/rights/messages/de/core.php
	protected/modules/rights/messages/de/install.php
	protected/modules/rights/messages/el/core.php
	protected/modules/rights/messages/el/install.php
	protected/modules/rights/messages/es/core.php
	protected/modules/rights/messages/es/install.php
	protected/modules/rights/messages/fi/core.php
	protected/modules/rights/messages/fi/install.php
	protected/modules/rights/messages/fr/core.php
	protected/modules/rights/messages/fr/install.php
	protected/modules/rights/messages/hu/core.php
	protected/modules/rights/messages/hu/install.php
	protected/modules/rights/messages/it/core.php
	protected/modules/rights/messages/it/install.php
	protected/modules/rights/messages/sv/core.php
	protected/modules/rights/messages/sv/install.php
	protected/modules/rights/messages/templates/core.php
	protected/modules/rights/messages/templates/install.php
	protected/modules/rights/messages/zh_cn/core.php
	protected/modules/rights/messages/zh_cn/install.php
	protected/modules/rights/models/GenerateForm.php
	protected/modules/rights/views/_menu.php
	protected/modules/rights/views/authItem/generate.php
	protected/modules/rights/views/install/error.php
	protected/views/projects/index.php
Merge branch 'master' into project

Conflicts:
	frontend/modules/projects/partials/list.html
	protected/config/main.php
	protected/messages/ru/inbox.php
	protected/models/ProjectObject.php
	protected/views/projects/index.php
Merge branch 'master' into project

Conflicts:
	frontend/modules/projects/partials/list.html
	protected/config/main.php
	protected/messages/ru/inbox.php
	protected/models/ProjectObject.php
	protected/views/projects/index.php
проект
Merge pull request #11 from org-espe/project

bootastrap 3
bootastrap 3