Updated from local
init CMS from home
Merge branch 'master' of https://github.com/Htoonlin/CMS

Conflicts:
	DB/cms_2013-10-16.sql.gz
	DB/model.mwb
	DB/model.mwb.bak
	README.md
	assets/default/css/DT_bootstrap.css
	assets/default/css/default.css
	assets/default/img/accept.png
	assets/default/img/add copy.png
	assets/default/img/add.png
	assets/default/img/close.png
	assets/default/img/coffee.png
	assets/default/img/dark_matter.zip
	assets/default/img/dark_matter/dark_matter.png
	assets/default/img/dark_matter/dark_matter_@2X.png
	assets/default/img/dark_matter/readme.txt
	assets/default/img/disk.png
	assets/default/img/edit copy.png
	assets/default/img/edit.png
	assets/default/img/file.png
	assets/default/img/flash.png
	assets/default/img/folder.png
	assets/default/img/img100x50.png
	assets/default/img/no_image.png
	assets/default/img/noise_lines.zip
	assets/default/img/noise_lines/noise_lines.png
	assets/default/img/noise_lines/noise_lines_@2X.png
	assets/default/img/noise_lines/readme.txt
	assets/default/img/outlets.zip
	assets/default/img/outlets/outlets.png
	assets/default/img/outlets/outlets_@2X.png
	assets/default/img/outlets/readme.txt
	assets/default/img/pixel_weave.zip
	assets/default/img/pixel_weave/pixel_weave.png
	assets/default/img/pixel_weave/pixel_weave_@2X.png
	assets/default/img/pixel_weave/readme.txt
	assets/default/img/remove.png
	assets/default/index.html
	assets/default/js/DT_bootstrap.js
	assets/default/js/splitter.js
	assets/default/js/trim.js
	assets/index.html
	assets/ref/datatable/Readme.txt
	assets/ref/datatable/component.json
	assets/ref/datatable/jquery.dataTables.js
	assets/ref/datatable/jquery.dataTables.min.js
	assets/ref/datatable/jquery.js
	assets/ref/datatable/license-bsd.txt
	assets/ref/datatable/license-gpl2.txt
	assets/ref/datatable/package.json
	assets/ref/dropzone/css/basic.css
	assets/ref/dropzone/css/dropzone.css
	assets/ref/dropzone/css/stylus/basic.styl
	assets/ref/dropzone/css/stylus/dropzone.styl
	assets/ref/dropzone/dropzone-amd-module.js
	assets/ref/dropzone/dropzone-amd-module.min.js
	assets/ref/dropzone/dropzone.js
	assets/ref/dropzone/dropzone.min.js
	assets/ref/dropzone/images/spritemap.png
	assets/ref/dropzone/images/spritemap@2x.png
	assets/ref/font-awesome/css/font-awesome-ie7.css
	assets/ref/font-awesome/css/font-awesome-ie7.min.css
	assets/ref/font-awesome/css/font-awesome.css
	assets/ref/font-awesome/css/font-awesome.min.css
	assets/ref/font-awesome/font/FontAwesome.otf
	assets/ref/font-awesome/less/bootstrap.less
	assets/ref/font-awesome/less/core.less
	assets/ref/font-awesome/less/extras.less
	assets/ref/font-awesome/less/font-awesome-ie7.less
	assets/ref/font-awesome/less/font-awesome.less
	assets/ref/font-awesome/less/icons.less
	assets/ref/font-awesome/less/mixins.less
	assets/ref/font-awesome/less/path.less
	assets/ref/font-awesome/less/variables.less
	assets/ref/font-awesome/scss/_bootstrap.scss
	assets/ref/font-awesome/scss/_core.scss
	assets/ref/font-awesome/scss/_extras.scss
	assets/ref/font-awesome/scss/_icons.scss
	assets/ref/font-awesome/scss/_mixins.scss
	assets/ref/font-awesome/scss/_path.scss
	assets/ref/font-awesome/scss/_variables.scss
	assets/ref/font-awesome/scss/font-awesome-ie7.scss
	assets/ref/font-awesome/scss/font-awesome.scss
	assets/ref/index.html
	assets/ref/jquery-1.10.2.js
	assets/ref/jquery-1.10.2.min.js
	assets/ref/jquery-1.10.2.min.map
	assets/ref/jquery-treeview/.gitignore
	assets/ref/jquery-treeview/changelog.md
	assets/ref/jquery-treeview/demo/async.html
	assets/ref/jquery-treeview/demo/bg.gif
	assets/ref/jquery-treeview/demo/demo.js
	assets/ref/jquery-treeview/demo/edit.html
	assets/ref/jquery-treeview/demo/images.html
	assets/ref/jquery-treeview/demo/index.html
	assets/ref/jquery-treeview/demo/large.html
	assets/ref/jquery-treeview/demo/prerendered.html
	assets/ref/jquery-treeview/demo/screen.css
	assets/ref/jquery-treeview/demo/simple.html
	assets/ref/jquery-treeview/demo/sortable.html
	assets/ref/jquery-treeview/demo/source.php
	assets/ref/jquery-treeview/demo/source.phps
	assets/ref/jquery-treeview/images/ajax-loader.gif
	assets/ref/jquery-treeview/images/file.gif
	assets/ref/jquery-treeview/images/folder-closed.gif
	assets/ref/jquery-treeview/images/folder.gif
	assets/ref/jquery-treeview/images/minus.gif
	assets/ref/jquery-treeview/images/plus.gif
	assets/ref/jquery-treeview/images/treeview-black-line.gif
	assets/ref/jquery-treeview/images/treeview-black.gif
	assets/ref/jquery-treeview/images/treeview-default-line.gif
	assets/ref/jquery-treeview/images/treeview-default.gif
	assets/ref/jquery-treeview/images/treeview-famfamfam-line.gif
	assets/ref/jquery-treeview/images/treeview-famfamfam.gif
	assets/ref/jquery-treeview/images/treeview-gray-line.gif
	assets/ref/jquery-treeview/images/treeview-gray.gif
	assets/ref/jquery-treeview/images/treeview-red-line.gif
	assets/ref/jquery-treeview/images/treeview-red.gif
	assets/ref/jquery-treeview/jquery.cookie.js
	assets/ref/jquery-treeview/jquery.treeview.async.js
	assets/ref/jquery-treeview/jquery.treeview.css
	assets/ref/jquery-treeview/jquery.treeview.edit.js
	assets/ref/jquery-treeview/jquery.treeview.js
	assets/ref/jquery-treeview/jquery.treeview.sortable.js
	assets/ref/jquery-treeview/readme.md
	assets/ref/jquery-ui/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_flat_55_ffffff_40x100.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_flat_75_ffffff_40x100.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_glass_65_ffffff_1x400.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png
	assets/ref/jquery-ui/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png
	assets/ref/jquery-ui/css/flick/images/ui-icons_0073ea_256x240.png
	assets/ref/jquery-ui/css/flick/images/ui-icons_454545_256x240.png
	assets/ref/jquery-ui/css/flick/images/ui-icons_666666_256x240.png
	assets/ref/jquery-ui/css/flick/images/ui-icons_ff0084_256x240.png
	assets/ref/jquery-ui/css/flick/images/ui-icons_ffffff_256x240.png
	assets/ref/jquery-ui/css/flick/jquery-ui-1.8.4.custom.css
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_40_db4865_40x40.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_50_93c3cd_40x40.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_50_ff3853_40x40.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_diagonals-small_75_ccd232_40x40.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_dots-medium_80_ffff38_4x4.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_dots-small_35_35414f_2x2.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_flat_75_ba9217_40x100.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_flat_75_ffffff_40x100.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-bg_white-lines_85_f7f7ba_40x100.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-icons_454545_256x240.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-icons_88a206_256x240.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-icons_c02669_256x240.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-icons_e1e463_256x240.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-icons_ffeb33_256x240.png
	assets/ref/jquery-ui/css/hot-sneaks/images/ui-icons_ffffff_256x240.png
	assets/ref/jquery-ui/css/hot-sneaks/jquery-ui-1.8.4.custom.css
	assets/ref/jquery-ui/css/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
	assets/ref/jquery-ui/css/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_217bc0_256x240.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_2e83ff_256x240.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_469bdd_256x240.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_6da8d5_256x240.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_cd0a0a_256x240.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_d8e7f3_256x240.png
	assets/ref/jquery-ui/css/redmond/images/ui-icons_f9bd01_256x240.png
	assets/ref/jquery-ui/css/redmond/jquery-ui-1.8.4.custom.css
	assets/ref/jquery-ui/css/smoothness/images/animated-overlay.gif
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	assets/ref/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	assets/ref/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
	assets/ref/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
	assets/ref/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
	assets/ref/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
	assets/ref/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
	assets/ref/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.css
	assets/ref/jquery-ui/css/smoothness/jquery-ui-1.10.3.custom.min.css
	assets/ref/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-icons_222222_256x240.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
	assets/ref/jquery-ui/css/ui-lightness/images/ui-icons_ffffff_256x240.png
	assets/ref/jquery-ui/css/ui-lightness/jquery-ui-1.8.4.custom.css
	assets/ref/jquery-ui/index.html
	assets/ref/jquery-ui/js/jquery-1.9.1.js
	assets/ref/jquery-ui/js/jquery-ui-1.10.3.custom.js
	assets/ref/jquery-ui/js/jquery-ui-1.10.3.custom.min.js
	assets/ref/lightbox/css/lightbox.css
	assets/ref/lightbox/img/close.png
	assets/ref/lightbox/img/loading.gif
	assets/ref/lightbox/img/next.png
	assets/ref/lightbox/img/prev.png
	assets/ref/lightbox/js/lightbox-2_6_min.js
	assets/ref/zip/DataTables-1.9.4.zip
	assets/ref/zip/bootstrap-3.0.0.zip
	assets/ref/zip/dropzone.zip
	assets/ref/zip/fancyapps-fancyBox-v2.1.5-0-ge2248f4.zip
	assets/ref/zip/font-awesome.zip
	assets/ref/zip/jquery-ui-1.10.3.custom.zip
	assets/ref/zip/lightbox2.6.zip
	assets/ref/zip/summernote-master.zip
	ci/core/Common.php
	ci/core/Controller.php
	ci/core/Loader.php
	ci/core/Utf8.php
	ci/core/index.html
	ci/database/DB_active_rec.php
	ci/database/DB_cache.php
	ci/database/DB_driver.php
	ci/database/DB_forge.php
	ci/database/DB_result.php
	ci/database/DB_utility.php
	ci/database/drivers/cubrid/cubrid_driver.php
	ci/database/drivers/cubrid/cubrid_forge.php
	ci/database/drivers/cubrid/cubrid_result.php
	ci/database/drivers/cubrid/cubrid_utility.php
	ci/database/drivers/cubrid/index.html
	ci/database/drivers/index.html
	ci/database/drivers/mssql/index.html
	ci/database/drivers/mssql/mssql_driver.php
	ci/database/drivers/mssql/mssql_forge.php
	ci/database/drivers/mssql/mssql_result.php
	ci/database/drivers/mssql/mssql_utility.php
	ci/database/drivers/mysql/index.html
	ci/database/drivers/mysql/mysql_driver.php
	ci/database/drivers/mysql/mysql_forge.php
	ci/database/drivers/mysql/mysql_result.php
	ci/database/drivers/mysql/mysql_utility.php
	ci/database/drivers/mysqli/index.html
	ci/database/drivers/mysqli/mysqli_driver.php
	ci/database/drivers/mysqli/mysqli_forge.php
	ci/database/drivers/mysqli/mysqli_result.php
	ci/database/drivers/mysqli/mysqli_utility.php
	ci/database/drivers/oci8/index.html
	ci/database/drivers/oci8/oci8_driver.php
	ci/database/drivers/oci8/oci8_forge.php
	ci/database/drivers/oci8/oci8_result.php
	ci/database/drivers/oci8/oci8_utility.php
	ci/database/drivers/odbc/index.html
	ci/database/drivers/odbc/odbc_driver.php
	ci/database/drivers/odbc/odbc_forge.php
	ci/database/drivers/odbc/odbc_result.php
	ci/database/drivers/odbc/odbc_utility.php
	ci/database/drivers/pdo/index.html
	ci/database/drivers/pdo/pdo_driver.php
	ci/database/drivers/pdo/pdo_forge.php
	ci/database/drivers/pdo/pdo_result.php
	ci/database/drivers/pdo/pdo_utility.php
	ci/database/drivers/postgre/index.html
	ci/database/drivers/postgre/postgre_driver.php
	ci/database/drivers/postgre/postgre_forge.php
	ci/database/drivers/postgre/postgre_result.php
	ci/database/drivers/postgre/postgre_utility.php
	ci/database/drivers/sqlite/index.html
	ci/database/drivers/sqlite/sqlite_driver.php
	ci/database/drivers/sqlite/sqlite_forge.php
	ci/database/drivers/sqlite/sqlite_result.php
	ci/database/drivers/sqlite/sqlite_utility.php
	ci/database/drivers/sqlsrv/index.html
	ci/database/drivers/sqlsrv/sqlsrv_driver.php
	ci/database/drivers/sqlsrv/sqlsrv_forge.php
	ci/database/drivers/sqlsrv/sqlsrv_result.php
	ci/database/drivers/sqlsrv/sqlsrv_utility.php
	ci/database/index.html
	ci/fonts/index.html
	ci/fonts/texb.ttf
	ci/helpers/array_helper.php
	ci/helpers/captcha_helper.php
	ci/helpers/cookie_helper.php
	ci/helpers/date_helper.php
	ci/helpers/directory_helper.php
	ci/helpers/download_helper.php
	ci/helpers/email_helper.php
	ci/helpers/file_helper.php
	ci/helpers/form_helper.php
	ci/helpers/html_helper.php
	ci/helpers/index.html
	ci/helpers/inflector_helper.php
	ci/helpers/language_helper.php
	ci/helpers/number_helper.php
	ci/helpers/path_helper.php
	ci/helpers/security_helper.php
	ci/helpers/smiley_helper.php
	ci/helpers/string_helper.php
	ci/helpers/text_helper.php
	ci/helpers/typography_helper.php
	ci/helpers/url_helper.php
	ci/helpers/xml_helper.php
	ci/index.html
	ci/language/english/calendar_lang.php
	ci/language/english/date_lang.php
	ci/language/english/db_lang.php
	ci/language/english/email_lang.php
	ci/language/english/form_validation_lang.php
	ci/language/english/ftp_lang.php
	ci/language/english/imglib_lang.php
	ci/language/english/index.html
	ci/language/english/migration_lang.php
	ci/language/english/number_lang.php
	ci/language/english/profiler_lang.php
	ci/language/english/unit_test_lang.php
	ci/language/english/upload_lang.php
	ci/language/index.html
	ci/libraries/Cache/Cache.php
	ci/libraries/Cache/drivers/Cache_apc.php
	ci/libraries/Cache/drivers/Cache_dummy.php
	ci/libraries/Cache/drivers/Cache_file.php
	ci/libraries/Cache/drivers/Cache_memcached.php
	ci/libraries/Calendar.php
	ci/libraries/Cart.php
	ci/libraries/Driver.php
	ci/libraries/Email.php
	ci/libraries/Encrypt.php
	ci/libraries/Form_validation.php
	ci/libraries/Ftp.php
	ci/libraries/Image_lib.php
	ci/libraries/Javascript.php
	ci/libraries/Log.php
	ci/libraries/Migration.php
	ci/libraries/Pagination.php
	ci/libraries/Parser.php
	ci/libraries/Profiler.php
	ci/libraries/Session.php
	ci/libraries/Sha1.php
	ci/libraries/Table.php
	ci/libraries/Trackback.php
	ci/libraries/Typography.php
	ci/libraries/Unit_test.php
	ci/libraries/Upload.php
	ci/libraries/User_agent.php
	ci/libraries/Xmlrpc.php
	ci/libraries/Xmlrpcs.php
	ci/libraries/Zip.php
	ci/libraries/index.html
	ci/libraries/javascript/Jquery.php
	cms/.htaccess
	cms/cache/.htaccess
	cms/cache/index.html
	cms/config/autoload.php
	cms/config/config.php
	cms/config/constants.php
	cms/config/database.php
	cms/config/doctypes.php
	cms/config/email.php
	cms/config/foreign_chars.php
	cms/config/hooks.php
	cms/config/index.html
	cms/config/migration.php
	cms/config/mimes.php
	cms/config/profiler.php
	cms/config/routes.php
	cms/config/smileys.php
	cms/config/upload.php
	cms/config/user_agents.php
	cms/controllers/admin/comment.php
	cms/controllers/admin/customer_request.php
	cms/controllers/admin/entity.php
	cms/controllers/admin/entity_data.php
	cms/controllers/admin/general.php
	cms/controllers/admin/login.php
	cms/controllers/admin/media.php
	cms/controllers/admin/post.php
	cms/controllers/admin/user.php
	cms/controllers/face.php
	cms/controllers/index.html
	cms/core/My_Controller.php
	cms/core/My_Model.php
	cms/core/index.html
	cms/errors/error_404.php
	cms/errors/error_db.php
	cms/errors/error_general.php
	cms/errors/error_php.php
	cms/errors/index.html
	cms/helpers/custom_control_helper.php
	cms/helpers/view_helper.php
	cms/index.html
	cms/language/english/index.html
	cms/logs/index.html
	cms/models/customer_request_model.php
	cms/models/datafile_model.php
	cms/models/entity_data_model.php
	cms/models/entity_model.php
	cms/models/entity_property_model.php
	cms/models/index.html
	cms/models/menu_model.php
	cms/models/post_model.php
	cms/models/temp_model.php
	cms/models/user_model.php
	cms/views/admin/blog/index.php
	cms/views/admin/comment/index.php
	cms/views/admin/data/form.php
	cms/views/admin/data/index.php
	cms/views/admin/entity/detail.php
	cms/views/admin/entity/index.php
	cms/views/admin/general/index.php
	cms/views/admin/general/setting.php
	cms/views/admin/layout.php
	cms/views/admin/layout_old.php
	cms/views/admin/login.php
	cms/views/admin/media/index.php
	cms/views/admin/media/upload.php
	cms/views/admin/post/detail.php
	cms/views/admin/post/index.php
	cms/views/admin/request/detail.php
	cms/views/admin/request/index.php
	cms/views/admin/user/detail.php
	cms/views/admin/user/index.php
	cms/views/face/aboutus.php
	cms/views/face/customer.php
	cms/views/face/index.php
	cms/views/face/product.php
	cms/views/face/training.php
	cms/views/index.html
	cms/views/layout.php
	index.php
	license.txt