ds
Merge branch 'master' of https://github.com/atarasov/mironov

Conflicts:
	app/controllers/cash_controller.rb
	app/controllers/cashc_controller.rb
	app/views/cash/index.html.erb
	app/views/cashc/index.html.erb
ds