Got rid of duplicate crown laws
Merge branch 'cm' into beta