init2
Merge branch 'master' of https://github.com/dongysh/expo

Conflicts:
	.htaccess
	application/config/routes.php
	application/controllers/company.php
	application/controllers/join.php
	application/controllers/login.php
	application/controllers/product.php
	application/controllers/purchase.php
	application/controllers/search.php
	application/models/company_model.php
	application/models/company_personal_model.php
	application/models/industry_model.php
	application/models/product_model.php
	application/views/company/ls.php
	application/views/company/product.php
	application/views/helper/about.php
	application/views/helper/account_membership.php
	application/views/helper/contact.php
	application/views/helper/global_expo_certificate.php
	application/views/helper/my_favorites.php
	application/views/helper/terms_of_use.php
	application/views/join/index.php
	application/views/layout/footer.php
	application/views/layout/header.php
	application/views/layout/public/banner.php
	application/views/layout/public/company_result_list.php
	application/views/layout/public/no_result.php
	application/views/layout/public/product_result_list.php
	application/views/layout/static/download.php
	application/views/layout/static/hot_products.php
	application/views/login/email_validate.php
	application/views/login/index.php
	application/views/password/cant_reset.php
	application/views/password/forgot.php
	application/views/password/reset.php
	application/views/password/sendsuccess.php
	application/views/product/index.php
	application/views/purchase/index.php
	application/views/search/result.php
	application/views/welcome/index.php
	webroot/images/facebook.png
	webroot/images/login_bg.png
	webroot/images/logo.png
	webroot/images/twitter.png
	webroot/stylesheets/global.css