Code cleanup and quick match history fix
Merge branch 'dennis' into chris
Some changes to CoreData model
Merge branch 'chris' into dennis