fix
conflict fix
Merge branch 'master' of https://github.com/losu/match_bets
views changes
views changes