more strings!
Merge branch 'dominion-ui' of https://github.com/courageousillumination/deckr into dominion-ui

Conflicts:
	webapp/deckr/static/deckr/js/sockets.js
	webapp/game_defs/dominion/dominion.py
	webapp/game_defs/dominion/layout.html