Merge branch 'master' of https://github.com/LaStrada/BeerTasting

Conflicts:
	BeerTasting/settings.py
Conflict fix