Merge origin/master

Conflicts:
	CardGame/src/cardgame/Card.java
Merge origin/master
fixes