merged with master

diff --cc README.md
Simple merge

diff --cc bower.json
index f4b07a058ba928608c2268ca6ebc819b01e3a374,734f92c286fde558c576856243ffe38071c77f37..a07756ffb8310bd764c04a07eaebc92d144933c4
--- 1/bower.json
--- 2/bower.json
+++ b/bower.json
@@@ -18,13 -18,8 +18,13 @@@
      "**/tests"
    ],
    "dependencies": {
-     "vaadin-grid": "vaadin/vaadin-grid#master"
+     "vaadin-grid": "vaadin/vaadin-grid#0.9.0-beta1"
    },
 +  "devDependencies": {
 +    "iron-doc-viewer": "polymerelements/iron-doc-viewer#~1.0.3",
 +    "hydrolysis": "polymer/hydrolysis#~1.15.1",
 +    "lodash": "~3.9.3"
 +  },
    "resolutions": {
      "polymer": "v1.1.1"
    }