Add Capability and State class (refs #79)
Merge branch 'master' into cmake_generalization