Merge pull request #215 from baev/master

severity to labels
Merge pull request #218 from baev/master

beforeClass & afterClass
add - junit test timeout support. Fixes #152
Merge remote-tracking branch 'origin/master'