Merge branch 'master' into button13

Conflicts:
	android/src/com/zap/main/Card.java
	android/src/com/zap/main/Opponent.java
	android/src/com/zap/main/Player.java