link.
Merge branch 'develop' of git@github.com:ErythroME/Goo.git into develop

Conflicts:
	application/views/Public/Public/PublicCommodity.php
Merge branch 'develop' of git@github.com:ErythroME/Goo.git into develop

Conflicts:
	application/views/Public/Public/PublicCommodityIndex.html
	application/views/Public/Public/header.php
Merge branch 'develop' of git@github.com:ErythroME/Goo.git into develop

Conflicts:
	Application/models/ArticleModel.php
	application/models/ArticleModel.php
	application/models/CarModel.php
	application/views/Public/Member/MemberSignUp1.php
	application/views/Public/Public/header.php