Fix #231: tokens.xml no longer overwritten by cards.xml.
Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml.
Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml

Conflicts:
	cockatrice/src/carddatabase.cpp
Merge pull request #238 from arxanas/no-overwrite-tokens-xml

Fix #231: tokens.xml no longer overwritten by cards.xml.