Fixed bug with setting types
Merge branch 'master' of github.com:blakevanlan/KingdomCreator