payment
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
	protected/models/User.php
	protected/views/user/bonus.php
z