Merge pull request #1875 from jlipps/master

update selendroid
jshint es5 is now on by default