Merge branch 'master' into sort-ratings

Conflicts:
BeerTasting/templates/stats.html