add
add ajax
dix
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/Agent/addmoney.php
	protected/views/layouts/column3.php
update
none
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/config/main.php
add template
update image
add weixin demo
add template
add channel
add  weixin
Merge remote-tracking branch 'origin/master'
add template
add some
Merge branch 'master' of github.com:newTopher/dlwx

Conflicts:
	protected/views/Agent/adduser.php
	protected/views/layouts/column3.php
add template
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/agentusercheck/check.php
	protected/views/login/login.php