CountryController.php
Merge branch 'master' of https://github.com/hyt7212/wx4yii2

Conflicts:
	controllers/CountryController.php
	controllers/SiteController.php
	models/Country.php
	models/CountrySearch.php
	models/EntryForm.php
	views/country/_form.php
	views/country/create.php
	views/country/update.php
	views/country/view.php
	views/site/say.php