Fix naming and merge
Merge branch 'master' of https://github.com/KoshkinAlex/fincontrol

Conflicts:
	protected/views/payment/_form.php
Merge branch 'master' of https://github.com/KoshkinAlex/fincontrol

Conflicts:
	protected/views/payment/_form.php
Merge branch 'master' of https://github.com/KoshkinAlex/fincontrol
Merge branch 'tmp'

Conflicts:
	protected/controllers/PaymentController.php
	protected/views/payment/_form.php