Chico dev

Merging new Character classes to dev branch