Corrected a bug involving non-empty content schema types.  Added a unit test.
Merge branch 'master' of https://github.com/DaMSL/K3-Core