trying to synchronize and merge :-(
Merge branch 'master' of https://github.com/nonokun/hstcg.git

Conflicts:
	hearthstone/src/com/hearthstone/cardGeneration/CardWriter.java