added WebDriverWait class
changes
merge changes from master