Merge branch 'master' into editor-redesign

Conflicts: cockatrice/src/carddatabasemodel.cpp cockatrice/src/carddatabasemodel.h cockatrice/src/decklistmodel.cpp cockatrice/src/decklistmodel.h cockatrice/src/tab_deck_editor.cpp cockatrice/src/tab_deck_editor.h

Merge branch 'master' into editor-redesign
Conflicts: cockatrice/src/carddatabasemodel.cpp cockatrice/src/carddatabasemodel.h cockatrice/src/decklistmodel.cpp cockatrice/src/decklistmodel.h cockatrice/src/tab_deck_editor.cpp cockatrice/src/tab_deck_editor.h
07706262 · sylvanbasilisk · 748aac7e · ed5f02bf · 07706262 · 07706262
Commit 07706262 authored Mar 25, 2014 by sylvanbasilisk
--- a/cockatrice/src/gameselector.h
+++ b/cockatrice/src/gameselector.h
--- a/cockatrice/src/gamesmodel.cpp
+++ b/cockatrice/src/gamesmodel.cpp
--- a/cockatrice/src/gamesmodel.h
+++ b/cockatrice/src/gamesmodel.h
--- a/cockatrice/src/gameview.cpp
+++ b/cockatrice/src/gameview.cpp
--- a/cockatrice/src/gameview.h
+++ b/cockatrice/src/gameview.h
--- a/cockatrice/src/handcounter.cpp
+++ b/cockatrice/src/handcounter.cpp
--- a/cockatrice/src/handcounter.h
+++ b/cockatrice/src/handcounter.h
--- a/cockatrice/src/handzone.cpp
+++ b/cockatrice/src/handzone.cpp
--- a/cockatrice/src/handzone.h
+++ b/cockatrice/src/handzone.h
--- a/cockatrice/src/localclient.cpp
+++ b/cockatrice/src/localclient.cpp
--- a/cockatrice/src/localclient.h
+++ b/cockatrice/src/localclient.h
--- a/cockatrice/src/localserver.cpp
+++ b/cockatrice/src/localserver.cpp
--- a/cockatrice/src/localserver.h
+++ b/cockatrice/src/localserver.h
--- a/cockatrice/src/localserverinterface.cpp
+++ b/cockatrice/src/localserverinterface.cpp
--- a/cockatrice/src/localserverinterface.h
+++ b/cockatrice/src/localserverinterface.h
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
--- a/cockatrice/src/messagelogwidget.h
+++ b/cockatrice/src/messagelogwidget.h
--- a/cockatrice/src/pending_command.h
+++ b/cockatrice/src/pending_command.h
--- a/cockatrice/src/phasestoolbar.cpp
+++ b/cockatrice/src/phasestoolbar.cpp