tags config
Merge remote-tracking branch 'origin/liz_dev' into liz_dev

Conflicts:
	application/config/jia.php.default