Stopped deck overlay from appearing in arena mode

Also fixed a NullPointerException caused when playing with an unknown deck (such as when playing in arena!)
Merge branch 'master' into monitor-log