prices for contractors
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/show.html.haml
	config/locales/ru.yml