Fix #45: don't send tokens to deckstats.
Room and Message tabs: focus input line when convenient; Fix #180

As suggest by Daenyth in #185
Fix #117: Card tags now match disregarding case and punctuation.
Merge remote-tracking branch 'upstream/master' into master_regression_180_tab
Fix: ensure git is always run from the project directory

When trying to obtain the version hash
Windows + CPack: fix packaging

Package the correct cpack’s temporary directory
Merge pull request #209 from ctrlaltca/cpack_win_fixes

Cpack fixes for windows (fixes #207)
Add WITH_QT4 note to README
Merge pull request #194 from ctrlaltca/master_regression_180_tab

Room and Message tabs: focus input line when convenient; Fix #180
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
Removed cmake from Travis's OS X dependencies.
Merge branch 'travis-osx-no-cmake' into deck-parser-ampersand
Merge pull request #221 from arxanas/travis-osx-no-cmake

Removed cmake from Travis's OS X dependencies.
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 case-insensitive-card-tag
Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand
Ignore diacritics as well.

So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card].
Also I removed some debugging information I accidentally left in.
Merge pull request #197 from arxanas/case-insensitive-card-tag

Fix #117: Card tags now match disregarding case and punctuation.