Merge pull request #298 from magfest/selenium_testing

WIP Selenium testing
Merge branch 'master' into develop