lala
x
111
великое слияние
великое слияние
part 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	media/assets/plugins/jquery.smint.js
	media/css/admin/bath_admin.css
	media/css/admin/styles.css
	media/css/styles.css
	media/images/img1.jpg
	media/images/img2.jpg
	media/images/img3.jpg
	media/images/img4.jpg
	media/images/img5.jpg
	media/js/layouts/admin_bath.js
	media/js/layouts/bath_index.js
	media/js/layouts/bath_item.js
	protected/.gitignore
	protected/components/ImageWidget.php
	protected/components/ManangerImg.php
	protected/components/UserIdentity.php
	protected/config/main.php
	protected/db_changes/24.03.2014_Org_table
	protected/db_changes/25.03.2014_manager_table
	protected/models/BathhouseDetail.php
	protected/models/Manager.php
	protected/models/User.php
	protected/modules/admin/controllers/BathhouseDetailController.php
	protected/modules/admin/controllers/OrganizationController.php
	protected/modules/admin/views/bathhouseRoom/_roomform.php
	protected/modules/admin/views/bathhouseRoom/_roomoptionform.php
	protected/modules/admin/views/bathhouseRoom/_roompriceform.php
	protected/modules/admin/views/bathhouseRoom/_roomsettingsform.php
	protected/modules/admin/views/organization/_form.php
	protected/modules/admin/views/organization/create.php
	protected/modules/admin/views/organization/update.php
	protected/modules/bath/modules/admin/components/AdminController.php
	protected/modules/bath/modules/admin/components/BathAdminController.php
	protected/modules/bath/modules/admin/controllers/IndexController.php
	protected/modules/bath/modules/admin/models/LoginForm.php
	protected/modules/bath/modules/admin/views/index/index.php
	protected/modules/bath/modules/admin/views/index/login.php
	protected/modules/bath/views/index/index.php
	protected/views/layouts/bath_admin_login.php
	protected/views/layouts/bath_admin_main.php
	protected/views/layouts/v_sidebar_menu_0.php
	protected/views/layouts/v_sidebar_menu_1.php
	protected/views/layouts/v_sidebar_menu_for_org.php