Merging to work on top of test framework changes
added documentation for manual tests
rebase from master
Merge remote-tracking branch 'upstream/master'