add msg
add some
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/ApiController.php
	protected/controllers/CallingcardManageController.php
	protected/models/MsgListModel.php
	protected/models/WxuserModel.php
	protected/views/callingCard/card.php
	protected/views/callingcardManage/add.php
	protected/views/callingcardManage/index.php