UI TESTS
Merge pull request #214 from pachalad/master

UI TESTS
UI TESTS
Merge pull request #215 from pachalad/master

UI TESTS
Merge remote-tracking branch 'upstream/master'
push so i can pull. not much changed