Changed selenium server to use lime
Merge remote-tracking branch 'origin/master'