temporary commit to pull
Merge https://github.com/mjothy/Dice-Paper

Conflicts:
	src/edu/jdr/DicePaper/activity/CharSheetDef.java
merging again
C'est faux