Merge branch 'master' into Eran
Set is_elimination in phase import
Add import validations
Merge branch 'Adar'
Show import status  in import page
delete irrelevant file
Merge branch 'Eran'
Merge branch 'master' into Eran
Match sales histories
sort import status
sty release bug + better status update
Merge branch 'Eran'
Merge branch 'master' into Adar

Conflicts:
	udobuApp/db/schema.rb
merge