Merge branch 'master' into develop

# Conflicts:
#	demo/libs/framework/framework.min.js
#	demo/src/game/MainScene.ts
#	source/bin/framework.min.js

demo/libs/framework/framework.d.ts

@@ -311,19 +311,6 @@ declare class Mesh extends RenderableComponent {
     render(camera: Camera): void;
     reset(): void;
 }
-declare class Sprite {
-    texture2D: egret.Texture;
-    readonly sourceRect: Rectangle;
-    readonly center: Vector2;
-    origin: Vector2;
-    readonly uvs: Rectangle;
-    constructor(texture: egret.Texture, sourceRect?: Rectangle, origin?: Vector2);
-}
-declare class SpriteAnimation {
-    readonly sprites: Sprite[];
-    readonly frameRate: number;
-    constructor(sprites: Sprite[], frameRate: number);
-}
 declare class SpriteRenderer extends RenderableComponent {
     private _origin;
     private _sprite;
@@ -338,6 +325,35 @@ declare class SpriteRenderer extends RenderableComponent {
     onRemovedFromEntity(): void;
     reset(): void;
 }
+declare class TiledSpriteRenderer extends SpriteRenderer {
+    protected sourceRect: Rectangle;
+    protected leftTexture: egret.Bitmap;
+    protected rightTexture: egret.Bitmap;
+    scrollX: number;
+    scrollY: number;
+    constructor(sprite: Sprite);
+    render(camera: Camera): void;
+}
+declare class ScrollingSpriteRenderer extends TiledSpriteRenderer {
+    scrollSpeedX: number;
+    scroolSpeedY: number;
+    private _scrollX;
+    private _scrollY;
+    update(): void;
+}
+declare class Sprite {
+    texture2D: egret.Texture;
+    readonly sourceRect: Rectangle;
+    readonly center: Vector2;
+    origin: Vector2;
+    readonly uvs: Rectangle;
+    constructor(texture: egret.Texture, sourceRect?: Rectangle, origin?: Vector2);
+}
+declare class SpriteAnimation {
+    readonly sprites: Sprite[];
+    readonly frameRate: number;
+    constructor(sprites: Sprite[], frameRate: number);
+}
 declare class SpriteAnimator extends SpriteRenderer {
     onAnimationCompletedEvent: Function;
     speed: number;
@@ -371,13 +387,6 @@ declare enum State {
     paused = 2,
     completed = 3
 }
-declare class TiledSpriteRenderer extends SpriteRenderer {
-    protected sourceRect: Rectangle;
-    scrollX: number;
-    scrollY: number;
-    constructor(sprite: Sprite);
-    render(camera: Camera): void;
-}
 interface ITriggerListener {
     onTriggerEnter(other: Collider, local: Collider): any;
     onTriggerExit(other: Collider, local: Collider): any;