Dice are rollable
Merge branch 'dev-die' into development

Conflicts:
	development.db
Push for demonstration to mark