test for moztrap 5936. addresses #87
resolved merge conflicts
fixed failing test after merge
some simplification
Fixed Excepton handling
Merge pull request #100 from sashakruglov/Exception_handling_fix

Fixed Excepton handling
Fixed NameError
Merge pull request #104 from sashakruglov/fix_failing_in_test_that_user_can_login_and_logout

Fixed NameError
use css selector to get selected option
Merge pull request #96 from sashakruglov/moztrap_5936

Issue #87. Moztrap #5936
Merge remote-tracking branch 'upstream/master' into moztrap_2743

merge with master
code review