Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/java24hours/BlankFiller.java
	src/com/java24hours/Clock.java
	src/com/java24hours/Dice.java
	src/com/java24hours/Root.java
Signed-off-by:matt.ballance <matt.ballance@Stavanger.int.gsogeek.com>