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
Fix configuration loading
Servatrice: added authentication type "password"
Give servatrice example configuration some love

added "password" settings
commented all settings
Move server network settings to the bottom and add a disclaimer
Merge pull request #238 from arxanas/no-overwrite-tokens-xml

Fix #231: tokens.xml no longer overwritten by cards.xml.
Misc typos fixing
Added schema for _rooms table
Merge pull request #355 from ctrlaltca/servatrice_passwordauth

Servatrice password authentication