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
Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion).
Fix crash #202
Merge remote-tracking branch 'upstream/master' into fix_202
Removed unused variable, bool stripped, from classes and functions.
Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point.
Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog
Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect
Adding modified translation files
Add sideboard helpers.
Added the location Oracle attempted to save cards.xml to the failure message.
Fix oracle under windows
Merge pull request #289 from acron0/auto-connect

Added 'auto connect' checkbox to connect dialog.
Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers
Merge pull request #332 from ctrlaltca/sideboard-helpers

Sideboard helpers
Tokens use PT levels from cards.xml if available

I added a check to see if the event PT is empty, if it is, we try and
use the PT from the cards.xml. In resp to issue #330.
Merge pull request #281 from ctrlaltca/fix_202

Fix crash #202
Token PT is now set to DB values if not defined in event.