Fix #45: don't send tokens to deckstats.
Tabs to spaces.
Fix #183: Deck parser doesn't too eagerly replace ampersands.
Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand

Conflicts:
	common/decklist.cpp
Merge branch 'travis-osx-no-cmake' into deck-parser-ampersand
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' into deck-parser-ampersand
Æ now actually works with the case-insensitive tags.
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 #224 from arxanas/case-insensitive-card-tag

Æ now actually works with the case-insensitive tags.
Merge pull request #156 from arxanas/master

Fix #45: don't send tokens to deckstats.
Merge pull request #220 from arxanas/deck-parser-ampersand

Fix #183: Deck parser doesn't too eagerly replace ampersands.