Merge branch 'master' into 3.0.0

# Conflicts - all resolved:
#	dist/svg.js
#	dist/svg.min.js
#	package.json
#	spec/SpecRunner.html
#	spec/spec/boxes.js
#	spec/spec/element.js
#	spec/spec/image.js
#	spec/spec/svg.js
#	src/boxes.js
#	src/flatten.js
#	src/image.js
#	src/polyfill.js
#	src/style.js
#	src/svg.js

1 files changed, 35 insertions, 33 deletions

diff --git a/spec/SpecRunner.html b/spec/SpecRunner.html
index 6d0cc72..0da16b0 100644
--- a/spec/SpecRunner.html
+++ b/spec/SpecRunner.html
@@ -58,50 +58,52 @@
   </svg>
 
   <!-- include spec files here... -->
-  <script src="spec/svg.js"></script>
-  <script src="spec/selector.js"></script>
   <script src="spec/adopter.js"></script>
-  <script src="spec/regex.js"></script>
-  <script src="spec/container.js"></script>
-  <script src="spec/element.js"></script>
-  <script src="spec/memory.js"></script>
   <script src="spec/arrange.js"></script>
-  <script src="spec/event.js"></script>
+  <script src="spec/array.js"></script>
+  <script src="spec/bare.js"></script>
   <script src="spec/boxes.js"></script>
-  <script src="spec/matrix.js"></script>
-  <script src="spec/transformations.js"></script>
-  <script src="spec/point.js"></script>
-  <script src="spec/rect.js"></script>
   <script src="spec/circle.js"></script>
+  <script src="spec/clip.js"></script>
+  <script src="spec/color.js"></script>
+  <script src="spec/container.js"></script>
+  <script src="spec/defs.js"></script>
+  <script src="spec/doc.js"></script>
+  <script src="spec/easing.js"></script>
+  <script src="spec/element.js"></script>
   <script src="spec/ellipse.js"></script>
+  <script src="spec/event.js"></script>
+  <script src="spec/fx.js"></script>
+  <script src="spec/gradient.js"></script>
+  <script src="spec/group.js"></script>
+  <script src="spec/helper.js"></script>
+  <script src="spec/hyperlink.js"></script>
+  <script src="spec/image.js"></script>
   <script src="spec/line.js"></script>
-  <script src="spec/polyline.js"></script>
-  <script src="spec/polygon.js"></script>
-  <script src="spec/path.js"></script>
   <script src="spec/marker.js"></script>
-  <script src="spec/image.js"></script>
-  <script src="spec/text.js"></script>
-  <script src="spec/span.js"></script>
-  <script src="spec/textpath.js"></script>
-  <script src="spec/doc.js"></script>
-  <script src="spec/defs.js"></script>
-  <script src="spec/nested.js"></script>
-  <script src="spec/group.js"></script>
-  <script src="spec/gradient.js"></script>
-  <script src="spec/pattern.js"></script>
-  <script src="spec/use.js"></script>
-  <script src="spec/bare.js"></script>
-  <script src="spec/symbol.js"></script>
   <script src="spec/mask.js"></script>
-  <script src="spec/clip.js"></script>
-  <script src="spec/color.js"></script>
+  <script src="spec/matrix.js"></script>
+  <script src="spec/memory.js"></script>
+  <script src="spec/nested.js"></script>
   <script src="spec/number.js"></script>
-  <script src="spec/array.js"></script>
-  <script src="spec/hyperlink.js"></script>
+  <script src="spec/path.js"></script>
+  <script src="spec/pattern.js"></script>
+  <script src="spec/point.js"></script>
+  <script src="spec/polygon.js"></script>
+  <script src="spec/polyline.js"></script>
+  <script src="spec/rect.js"></script>
+  <script src="spec/regex.js"></script>
+  <script src="spec/selector.js"></script>
   <script src="spec/sugar.js"></script>
-  <script src="spec/fx.js"></script>
+  <script src="spec/svg.js"></script>
+  <script src="spec/symbol.js"></script>
+  <script src="spec/text.js"></script>
+  <script src="spec/textpath.js"></script>
+  <script src="spec/transformations.js"></script>
+  <script src="spec/tspan.js"></script>
+  <script src="spec/use.js"></script>
   <script src="spec/utils.js"></script>
+  <script src="spec/viewbox.js"></script>
 
-  <script type="text/javascript" src="spec/helper.js"></script>
 </body>
 </html>