removed miscellaneous actions from table cards
cleaned up classes
Merge branch 'combining-interface' of github.com:tonglil/zap into combining-interface
Merge 'combining-interface' into 'finalstages'

Conflicts:
	android/src/com/zap/GameActivity.java
	android/src/com/zap/PlayerHandCards.java
	android/src/com/zap/PlayerTableCards.java