Added some Javadocs to Card Classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	java/src/client/models/ICard.java
	java/src/shared/definitions/DevCardType.java