restore time_out to 120; rearrange test script execution order; remove assert in Login()
Merge remote-tracking branch 'origin/master' into aug21Master_A
Merge pull request #42 from reciprocity/aug21Master_A

Aug21 master a