fix orders_history
DEV-20231 bonus accounts fix
Merge branch 'master' of https://github.com/Unact/Market

Conflicts:
	db/schema.rb
Merge branch 'master' into releases