BEERS FIX
Merge branch 'test-sjaan' of https://github.com/Genuscastor/bross into test-sjaan

Conflicts:
	bross/beer/models.py
	bross/contentblock/admin.py
	bross/templates/beersall.html