Merge branch 'webdriver-element' of github.com:emanlove/robotframework-selenium2library into webdriver-element

Conflicts:
	src/Selenium2Library/__init__.py

Author: emanlove

src/Selenium2Library/__init__.py

@@ -101,16 +101,12 @@ class Selenium2Library(
     | css        | Table Should Contain `|` css=table.my_class `|` text               | Matches by @id or @name attribute |
     | xpath      | Table Should Contain `|` xpath=//table/[@name="my_table"] `|` text | Matches by @id or @name attribute |
 
-<<<<<<< HEAD
-    = Timeouts =
-=======
     *Stale and Detached Elements*
 
     To be written... a talk about stale/detached elements, the dreaded
     StaleElementReferenceException and how to deal with these situations.
 
     *Timeouts*
->>>>>>> Updated documentation for locating objects using WebElements.
 
     There are several `Wait ...` keywords that take timeout as an
     argument. All of these timeout arguments are optional. The timeout