[modified] �߰� commit
[modified] GUI complete
Merge branch 'master' of https://github.com/WEBTEAM-ANCLE/YJTech

Conflicts:
	application/controllers/admin.php
	application/controllers/company.php
	application/controllers/consulting.php
	application/controllers/equipment.php
	application/controllers/product.php
	application/controllers/site.php
	application/controllers/support.php
	application/models/support_notice.php
	application/views/company/certificate.php
	application/views/company/facilities.php
	application/views/company/history.php
	application/views/consulting/design.php
	application/views/consulting/interpretation.php
	application/views/consulting/quality_control.php
	application/views/equipment/carbon.php
	application/views/equipment/expander.php
	application/views/equipment/gild.php
	application/views/equipment/hiting.php
	application/views/equipment/rubber.php
	application/views/equipment/suction.php
	application/views/footer.php
	application/views/header.php
	application/views/loggin.php
	application/views/middle.php
	application/views/navi.php
	application/views/site.php
	application/views/support/notice.php
	application/views/support/notice_detail.php
	static/css/bootstrap.css
	static/css/main.css
	static/js/common.js