Change and modify
Merge branch 'develop' of https://github.com/ErythroME/Goo.git into develop

Conflicts:
	Application/models/AdministratorModel.php
	Application/models/AffairModel.php
	Application/models/ArticleModel.php
	Application/models/CarModel.php
	Application/models/CommodityModel.php
	Application/models/ImageModel.php
	Application/models/MessageModel.php
	Application/models/PolicyModel.php
	Application/views/Public/Admin/AdminAddArticle.php
	Application/views/Public/Admin/AdminAlterArticle.html
	Application/views/Public/Admin/AdminLogin.html
	application/controllers/SignUpAction.php
	application/models/AdministratorModel.class.php
	application/models/AdministratorModel.php
	application/models/AffairModel.class.php
	application/models/AffairModel.php
	application/models/ArticleModel.class.php
	application/models/ArticleModel.php
	application/models/CarModel.class.php
	application/models/CarModel.php
	application/models/CommodityModel.class.php
	application/models/CommodityModel.php
	application/models/ImageModel.class.php
	application/models/ImageModel.php
	application/models/MessageModel.class.php
	application/models/MessageModel.php
	application/models/PolicyModel.class.php
	application/models/PolicyModel.php
	application/views/Public/Admin/AdminDeleteArticle.html
	application/views/Public/Member/MemberSignUp1.php