Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tool/publish.sh

.travis.yml

@@ -0,0 +1,28 @@
+sudo: false
+
+language: dart
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - libstdc++6
+    - fonts-droid
+
+install:
+- git clone https://github.com/flutter/flutter.git -b beta
+- ./flutter/bin/flutter doctor
+
+script:
+- ./flutter/bin/flutter test example
+
+cache:
+  directories:
+  - $HOME/.pub-cache
+
+deploy:
+  provider: script
+  script: ./tool/publish.sh
+  on:
+    branch: master

example/test/widget_test.dart

@@ -7,7 +7,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:example/main.dart';
+import '../lib/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {