Conflicts:
	cockatrice/src/carddatabase.cpp

Conflicts:
	cockatrice/src/carddatabase.cpp

Conflicts:
	cockatrice/src/carddatabase.cpp

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

So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card].
Also I removed some debugging information I accidentally left in.

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

Removed cmake from Travis's OS X dependencies.

Room and Message tabs: focus input line when convenient; Fix #180

Cpack fixes for windows (fixes #207)

Package the correct cpack’s temporary directory

When trying to obtain the version hash

Qt5 support

9sec was causing too many timeout issues.

Timeout from both client and server perspective needs to be revisited

Fixes #203

Fix #184: Deck loader reads 4x cardname correctly.

Fix #137: Game filter preferences are saved.

As suggest by Daenyth in #185

Focus the Input line in chat when convenient (fixes #113)

DB Maint Scripts

Renamed mysql configuration file to include example extension and set
git to ignore mysql.cnf per request.

Updates for performance improvements per request

External shell script to help maintain the cockatrice database tables.

Fix #155: Vanguard card names no longer conflict with regular card names.