fixed merge conflicts and made it possible to view a requirement's children
Merge branch 'developer' of https://github.com/djkirby/wpi-suite-tng into developer