Merge branch 'master' into chrome35

Conflicts:
	package.json

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.120.0",
+  "version": "0.121.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -80,7 +80,7 @@
     "command-palette": "0.24.0",
     "deprecation-cop": "0.7.0",
     "dev-live-reload": "1.0.0",
-    "exception-reporting": "0.18.0",
+    "exception-reporting": "0.19.0",
     "feedback": "0.33.0",
     "find-and-replace": "0.127.0",
     "fuzzy-finder": "0.57.0",

src/react-editor-view.coffee

@@ -239,3 +239,6 @@ class ReactEditorView extends View
       @component.setProps({placeholderText})
     else
       @props.placeholderText = placeholderText
+
+  lineElementForScreenRow: (screenRow) ->
+    $(@component.lineNodeForScreenRow(screenRow))