Merge remote-tracking branch 'upstream/master'

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

Conflicts:
	cockatrice/src/carddatabase.cpp