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

Conflicts:
	protected/views/Agent/addmoney.php
	protected/views/layouts/column3.php