Updates to Roll behavior and Discard
Merge remote-tracking branch 'origin/master'

Conflicts:
	Catan/java/src/client/roll/RollController.java
	Catan/java/src/client/roll/RollView.java
Revert "Updates to Roll behavior and Discard"

This reverts commit bd9fa2c821f735006358d30125f59a872e015845.