Merge branch 'master' of github.com:zuha/zuha
Merge branch 'dev' of razorit.beanstalkapp.com:/z into dev
Merge branch 'dev'
CakePHP 2.0 is at least showing the App - still lots of errors
File permissions fixed at local
Merge branch 'dev' of razorit.beanstalkapp.com:/z into dev

Conflicts:
	app/Config/Schema/empty
	app/webroot/css/images/ui-icons_222222_256x240.png
	app/webroot/css/images/ui-icons_2e83ff_256x240.png
	app/webroot/css/images/ui-icons_888888_256x240.png
	app/webroot/css/images/ui-icons_cd0a0a_256x240.png
	app/webroot/img/admin/ui-icons_454545_256x240.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	app/webroot/js/ckeditor/plugins/video/jquery-ui/js/jquery.js
	branches/CMS_Work/app/controllers/components/empty
	branches/CMS_Work/cake/tests/test_app/views/elements/empty
	branches/CMS_Work/cake/tests/test_app/views/errors/empty
	branches/CMS_Work/cake/tests/test_app/views/helpers/empty
	sites/adoptamodel.zuha.com/locale/eng/LC_MESSAGES/empty
	sites/adoptamodel.zuha.com/tests/cases/behaviors/empty
	sites/adoptamodel.zuha.com/tests/cases/components/empty
	sites/adoptamodel.zuha.com/tests/cases/controllers/empty
	sites/adoptamodel.zuha.com/tests/cases/helpers/empty
	sites/adoptamodel.zuha.com/tests/cases/models/empty
	sites/adoptamodel.zuha.com/tests/fixtures/empty
	sites/adoptamodel.zuha.com/tests/groups/empty
	sites/adoptamodel.zuha.com/tmp/cache/models/empty
	sites/adoptamodel.zuha.com/tmp/cache/persistent/empty
	sites/adoptamodel.zuha.com/tmp/cache/views/empty
	sites/adoptamodel.zuha.com/tmp/logs/empty
	sites/adoptamodel.zuha.com/tmp/sessions/empty
	sites/adoptamodel.zuha.com/tmp/tests/empty
	sites/allstatepackingandshipping.com/View/Themed/Default/webroot/css/empty
	sites/allstatepackingandshipping.com/View/Themed/Default/webroot/images/empty
	sites/allstatepackingandshipping.com/View/Themed/Default/webroot/js/empty
	sites/allstatepackingandshipping.com/tmp/cache/empty
	sites/allstatepackingandshipping.com/tmp/cache/models/empty
	sites/allstatepackingandshipping.com/tmp/cache/persistent/empty
	sites/allstatepackingandshipping.com/tmp/cache/views/empty
	sites/allstatepackingandshipping.com/tmp/empty
	sites/arrayya.com/View/Themed/Default/webroot/css/empty
	sites/arrayya.com/View/Themed/Default/webroot/images/empty
	sites/arrayya.com/View/Themed/Default/webroot/js/empty
	sites/arrayya.com/tmp/cache/empty
	sites/arrayya.com/tmp/cache/models/empty
	sites/arrayya.com/tmp/cache/persistent/empty
	sites/arrayya.com/tmp/cache/views/empty
	sites/arrayya.com/tmp/empty
	sites/arrayya.com/tmp/logs/empty
	sites/babyriddle.com/View/Themed/Default/webroot/css/empty
	sites/babyriddle.com/View/Themed/Default/webroot/images/empty
	sites/babyriddle.com/View/Themed/Default/webroot/js/empty
	sites/babyriddle.com/tmp/cache/empty
	sites/babyriddle.com/tmp/cache/models/empty
	sites/getrooted.com/View/Themed/Default/webroot/index.html
	sites/hairgenesisformen.com/Plugin/Orders/View/Authorizes/index.ctp
	sites/hairgenesisforwomen.com/Plugin/Orders/View/Authorizes/index.ctp
	sites/opentechcontrols.com/View/Themed/Default/webroot/images/spacer.gif
	sites/planetcolor.biz/View/Themed/Default/webroot/img/ajax-loader.gif
	sites/planetcolor.biz/View/Themed/Default/webroot/img/body.jpg
	sites/planetcolor.biz/View/Themed/Default/webroot/img/cake.icon.gif
	sites/planetcolor.biz/View/Themed/Default/webroot/img/zuha.power.gif
	sites/wwbe.com/View/Themed/Default/webroot/cs
	sites/wwbe.com/View/Themed/Default/webroot/css/datepicker.css
	sites/wwbe.com/View/Themed/Default/webroot/css/modalbox.css
	sites/wwbe.com/View/Themed/Default/webroot/images/ui-icons_222222_256x240.png
	sites/wwbe.com/View/Themed/Default/webroot/images/ui-icons_2e83ff_256x240.png
	sites/wwbe.com/View/Themed/Default/webroot/images/ui-icons_454545_256x240.png
	sites/wwbe.com/View/Themed/Default/webroot/images/ui-icons_888888_256x240.png
	sites/wwbe.com/View/Themed/Default/webroot/images/ui-icons_cd0a0a_256x240.png
	sites/wwbe.com/View/Themed/Default/webroot/img/ajax-loader.gif
	sites/wwbe.com/View/Themed/Default/webroot/img/body.jpg
	sites/wwbe.com/View/Themed/Default/webroot/img/cake.icon.gif
	sites/wwbe.com/View/Themed/Default/webroot/img/datepicker/bg_header.jpg
	sites/wwbe.com/View/Themed/Default/webroot/img/datepicker/bullet1.gif
	sites/wwbe.com/View/Themed/Default/webroot/img/datepicker/bullet2.gif
	sites/wwbe.com/View/Themed/Default/webroot/img/datepicker/cal.gif
	sites/wwbe.com/View/Themed/Default/webroot/img/datepicker/gradient-e5e5e5-ffffff.gif
	sites/wwbe.com/View/Themed/Default/webroot/img/zuha.power.gif
	sites/wwbe.com/View/Themed/Default/webroot/js/builder.js
	sites/wwbe.com/View/Themed/Default/webroot/js/dragdrop.js
	sites/wwbe.com/View/Themed/Default/webroot/js/slider.js
	sites/wwbe.com/View/Themed/Default/webroot/js/sound.js
	sites/wwbe.com/View/Themed/Default/webroot/js/swfobject.js
	sites/wwbe.com/View/Themed/Default/webroot/js/unittest.js
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	sites/wwbe.com/View/Themed/Default/webroot/osm/jquery-ui/js/jquery.js
	sites/zuha.org/View/Themed/Default/webroot/img/body.jpg
	sites/zuha.org/View/Themed/Default/webroot/img/cake.icon.gif
	sites/zuha.org/View/Themed/Default/webroot/img/zuha.power.gif
	trunk/app/webroot/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	trunk/app/webroot/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	trunk/app/webroot/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	trunk/app/webroot/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	trunk/app/webroot/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	trunk/app/webroot/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	trunk/app/webroot/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	trunk/app/webroot/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	trunk/app/webroot/css/smoothness/images/ui-icons_222222_256x240.png
	trunk/app/webroot/css/smoothness/images/ui-icons_2e83ff_256x240.png
	trunk/app/webroot/css/smoothness/images/ui-icons_454545_256x240.png
	trunk/app/webroot/css/smoothness/images/ui-icons_888888_256x240.png
	trunk/app/webroot/css/smoothness/images/ui-icons_cd0a0a_256x240.png
	trunk/app/webroot/js/jquery-1.4.2.min.js
	vendors/Svetlozar/Contacts/index.php
	vendors/Svetlozar/WebClients/index.php
	vendors/Svetlozar/index.php
removed forms
got rid of some css that should be in the root zuha mobi theme
merged dev to repo with deleted catalogs and orders
Merge branch 'master' of github.com:zuha/Calendars-Zuha-Cakephp-Plugin