bug fixes
use common dice lib
align dice
Merge branch 'develop'