Merge branch 'Adar'
Merge branch 'master' into Eran
Merge branch 'Adar'
Fix bug champions12-13 has 18 matches

Use Fixture_match_id instead if ID
Merge branch 'Eran'
Team name- search all fields if not found of XS
Merge branch 'master' into Eran
show match date time in active scaffold
Merge branch 'Eran'
fixed wrong warning in import
prevent development.log from growing
Merge branch 'master' into Eran
Add skipped lines to import status
Merge branch 'Eran'
Merge branch 'master' into Adar

Conflicts:
	udobuApp/db/schema.rb