updated documentation in basic and framework classes and tests
Merge pull request #2 from cipri-tom/trunk

Documentation update