Neth modifs
Merge branch 'master' of github.com:sarsenij/hearthstone-romandie

Conflicts:
	hsr/static/styles/style_1.css
	hsr/templates/base.html