Fix #45: don't send tokens to deckstats.
Merge remote-tracking branch 'upstream/master'

Some tabs to spaces, and maybe fixed to work with Qt 5.

Conflicts:
	cockatrice/src/deckstats_interface.cpp
	common/decklist.cpp
	common/decklist.h
	oracle/src/oracleimporter.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cockatrice/src/carddatabase.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cockatrice/src/carddatabase.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	cockatrice/src/carddatabase.cpp
Merge pull request #156 from arxanas/master

Fix #45: don't send tokens to deckstats.