Some NPE fixing for server and client.
Added Solitary Confinement, Words of War, Mirri's Guile, Replenish and City of Solitude.
Fixes for source.getSourceId in 2 cards
Merge branch 'master' of https://github.com/magefree/mage
Made Elemental token origin set Conflux
Fixed triggered ability of Guerrilla Tactics.
Adding Ray of command.
Merge pull request #503 from shieldal/master

Add Adun Oakenshield
Returning source.getSourceId() for DISCARED_CARD event
Reverting changes to Guerrilla Tactics as it works now
minor change
Some minor changes to Jace, the Mind Sculptor.
Some log improvement for player moves card.
* Add Predict, Mask of Memory, Rhystic Study and Perplex
implemented Chainer's Edict, Breath of Life.  Re-used TapEnchanted effect in Mystic Restraints
Replaced use of source.getId() by source.getSourceId() for Mage Sets.
Replaced use of source.getId() by source.getSourceId() for Mage Framework.
Changed duration of Intimidate to EndOfGame (like Flying and Shadow)  instead of WhileOnBattlefield.
Some minor logging and comment changes.
Fixed adouble calss name.