all commit
Merge branch 'master' of github.com:ycaihappy/mu

Conflicts:
	code/framework/zii/widgets/CBaseListView.php
	code/framework/zii/widgets/assets/gridview/styles.css
	code/webroot/assets/47c9d6d4/detailview/styles.css
	code/webroot/assets/47c9d6d4/gridview/jquery.yiigridview.js
	code/webroot/assets/47c9d6d4/gridview/styles.css
	code/webroot/assets/47c9d6d4/listview/jquery.yiilistview.js
	code/webroot/assets/47c9d6d4/listview/styles.css
	code/webroot/assets/728cd4d5/pager.css
	code/webroot/assets/909e0a39/autocomplete/jquery.autocomplete.css
	code/webroot/assets/909e0a39/jquery.autocomplete.js
	code/webroot/assets/909e0a39/jquery.ba-bbq.js
	code/webroot/assets/909e0a39/jquery.bgiframe.js
	code/webroot/assets/909e0a39/jquery.cookie.js
	code/webroot/assets/909e0a39/jquery.js
	code/webroot/assets/909e0a39/jquery.maskedinput.js
	code/webroot/assets/909e0a39/jquery.maskedinput.min.js
	code/webroot/assets/909e0a39/jquery.metadata.js
	code/webroot/assets/909e0a39/jquery.min.js
	code/webroot/assets/909e0a39/jquery.treeview.edit.js
	code/webroot/assets/909e0a39/jquery.treeview.js
	code/webroot/assets/909e0a39/jquery.yii.js
	code/webroot/assets/909e0a39/jquery.yiiactiveform.js
	code/webroot/assets/909e0a39/jquery.yiitab.js
	code/webroot/assets/909e0a39/jui/MIT-LICENSE.txt
	code/webroot/assets/909e0a39/jui/css/base/jquery-ui.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.accordion.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.autocomplete.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.button.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.core.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.datepicker.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.dialog.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.progressbar.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.resizable.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.selectable.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.slider.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.tabs.css
	code/webroot/assets/909e0a39/jui/css/base/jquery.ui.theme.css
	code/webroot/assets/909e0a39/jui/js/jquery-ui-i18n.min.js
	code/webroot/assets/909e0a39/jui/js/jquery-ui.min.js
	code/webroot/assets/909e0a39/yiitab/jquery.yiitab.css
	code/webroot/assets/ea53de00/css/ie.css
	code/webroot/assets/ea53de00/css/main.css
	code/webroot/assets/ea53de00/css/print.css
	code/webroot/assets/ea53de00/css/screen.css
	code/webroot/assets/ea53de00/js/fancybox/jquery.fancybox-1.3.1.pack.js
	code/webroot/assets/ea53de00/js/jquery.tooltip-1.2.6.min.js
	code/webroot/assets/ea53de00/js/main.js
Merge branch 'master' of github.com:ycaihappy/mu
supply model